diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8e08f1d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.class
-
-*.dex
-
-*.bak
-
-*.apk
-
-.fatjar
-bin/
-build/
-classes/
\ No newline at end of file
diff --git a/3.7.5.VERSION b/3.8.0.VERSION
similarity index 100%
rename from 3.7.5.VERSION
rename to 3.8.0.VERSION
diff --git a/README.md b/README.md
index 75b6a92..687a0cd 100644
--- a/README.md
+++ b/README.md
@@ -79,4 +79,18 @@ CIM是基于mina或者netty框架下的推送系统，我们平常使用第三
1.android sdk 优化，使用protobuf-lite版本替代较为臃肿的protobut-java版本
+
+
+-------------------------------------------------------------------------------------------
+版本:3.8.0/时间:2020-01-17
+
+1.服务端sdk将websocket的服务端口和原生socket的端口分离，可以禁用其中一个或者同时启用
+
+2.web端的sdk简化流程不再需要心跳响应,修改了连接成功回调方法名称和创建连接方法名
+
+3.andoid sdk修改几个广播action的名称以及回调方法名称，详见cim-client-android工程
+
+4.所有sdk均使用maven构建，idea工具开发，发现多处代码单词拼写错误，使用阿里语法检测组件优化了部分代码
+
+5.同步修改了文档
diff --git a/cim-boot-server/.gitignore b/cim-boot-server/.gitignore
new file mode 100644
index 0000000..07827cc
--- /dev/null
+++ b/cim-boot-server/.gitignore
@@ -0,0 +1,2 @@
+target/
+.idea/
\ No newline at end of file
diff --git a/cim-boot-server/cim-boot-server.iml b/cim-boot-server/cim-boot-server.iml
index d0a6f16..7e7cb66 100644
--- a/cim-boot-server/cim-boot-server.iml
+++ b/cim-boot-server/cim-boot-server.iml
@@ -25,55 +25,56 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -81,7 +82,7 @@
-
+
diff --git a/cim-boot-server/cim-boot-server.ipr b/cim-boot-server/cim-boot-server.ipr
index c892419..dac790d 100644
--- a/cim-boot-server/cim-boot-server.ipr
+++ b/cim-boot-server/cim-boot-server.ipr
@@ -15,6 +15,7 @@
+
@@ -110,92 +111,92 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -286,26 +287,26 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -319,26 +320,26 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -352,290 +353,301 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cim-boot-server/cim-boot-server.iws b/cim-boot-server/cim-boot-server.iws
index 09b3fb1..ced7a89 100644
--- a/cim-boot-server/cim-boot-server.iws
+++ b/cim-boot-server/cim-boot-server.iws
@@ -1,8 +1,10 @@
+
+
+
-
@@ -18,30 +20,21 @@
-
-
- CIMWebBridge
- cim-server-sdk-mina-3.7.0.jar
- cim.server.port
- memorySessionService
- Logger
-
-
- CIMPushManager
-
-
- C:\Users\Administrator\Documents\cim\cim-boot-server\src\main\resources
-
-
+
+
+
+
+
+
-
+
@@ -55,23 +48,12 @@
+
-
-
-
@@ -92,6 +74,18 @@
+
+
+
@@ -119,12 +113,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -133,6 +199,11 @@
72
+
+ jar://$PROJECT_DIR$/lib/cim-server-sdk-netty-3.7.0.jar!/com/farsunset/cim/sdk/server/coder/WebMessageEncoder.class
+ 22
+
+
diff --git a/cim-boot-server/lib/cim-server-sdk-mina-3.7.0.jar b/cim-boot-server/lib/cim-server-sdk-mina-3.7.0.jar
deleted file mode 100644
index 77045c5..0000000
Binary files a/cim-boot-server/lib/cim-server-sdk-mina-3.7.0.jar and /dev/null differ
diff --git a/cim-boot-server/lib/cim-server-sdk-netty-3.7.0.jar b/cim-boot-server/lib/cim-server-sdk-netty-3.7.0.jar
deleted file mode 100644
index 8ebb7c8..0000000
Binary files a/cim-boot-server/lib/cim-server-sdk-netty-3.7.0.jar and /dev/null differ
diff --git a/cim-boot-server/libs/cim-server-sdk-mina-3.8.0.jar b/cim-boot-server/libs/cim-server-sdk-mina-3.8.0.jar
new file mode 100644
index 0000000..fc03344
Binary files /dev/null and b/cim-boot-server/libs/cim-server-sdk-mina-3.8.0.jar differ
diff --git a/cim-boot-server/libs/cim-server-sdk-netty-3.8.0.jar b/cim-boot-server/libs/cim-server-sdk-netty-3.8.0.jar
new file mode 100644
index 0000000..5da5b91
Binary files /dev/null and b/cim-boot-server/libs/cim-server-sdk-netty-3.8.0.jar differ
diff --git a/cim-boot-server/pom.xml b/cim-boot-server/pom.xml
index 4f256c2..32e3335 100644
--- a/cim-boot-server/pom.xml
+++ b/cim-boot-server/pom.xml
@@ -11,7 +11,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.1.7.RELEASE
+ 2.2.2.RELEASE
@@ -19,7 +19,7 @@
1.8
4.1.35.Final
2.1.3
- 3.9.1
+ 3.11.1
@@ -39,10 +39,10 @@
com.farsunset
cim-server-sdk
- 3.7.0
+ 3.8.0
system
- ${project.basedir}/lib/cim-server-sdk-netty-3.7.0.jar
+ ${project.basedir}/libs/cim-server-sdk-netty-3.8.0.jar
@@ -128,13 +128,4 @@
-
-
-
- spring-releases
- Spring Releases
- https://repo.spring.io/release
-
-
-
\ No newline at end of file
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/ServerLauncher.java b/cim-boot-server/src/main/java/com/farsunset/cim/ServerLauncher.java
index 29783de..945e5b6 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/ServerLauncher.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/ServerLauncher.java
@@ -34,22 +34,7 @@ import org.springframework.boot.autoconfigure.websocket.reactive.WebSocketReacti
import org.springframework.boot.autoconfigure.websocket.servlet.WebSocketMessagingAutoConfiguration;
import org.springframework.boot.autoconfigure.websocket.servlet.WebSocketServletAutoConfiguration;
-/**
- *
- * 其中@SpringBootApplication申明让spring boot自动给程序进行必要的配置，
- * 等价于以默认属性使用@Configuration，@EnableAutoConfiguration和@ComponentScan
- */
@SpringBootApplication
-@EnableAutoConfiguration(exclude = { WebSocketMessagingAutoConfiguration.class,
- WebSocketReactiveAutoConfiguration.class,
- WebSocketServletAutoConfiguration.class,
- WebServicesAutoConfiguration.class,
- JmxAutoConfiguration.class,
- DataSourceAutoConfiguration.class,
- ValidationAutoConfiguration.class,
- WebClientAutoConfiguration.class,
- JacksonAutoConfiguration.class })
-
public class ServerLauncher {
public static void main(String[] args) {
SpringApplication.run(ServerLauncher.class, args);
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/NavigationController.java b/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/NavigationController.java
index 53f4960..5c0b4f5 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/NavigationController.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/NavigationController.java
@@ -22,6 +22,7 @@
package com.farsunset.cim.admin.controller;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
@@ -29,13 +30,13 @@ import org.springframework.web.servlet.ModelAndView;
@Controller
public class NavigationController {
- @RequestMapping(value = "/", method = RequestMethod.GET)
+ @GetMapping(value = "/")
public ModelAndView index(ModelAndView model) {
model.setViewName("console/index");
return model;
}
- @RequestMapping(value = "/webclient", method = RequestMethod.GET)
+ @GetMapping(value = "/webclient")
public ModelAndView webclient(ModelAndView model) {
model.setViewName("console/webclient/index");
return model;
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java b/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java
index c360cf0..5a7a660 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java
@@ -24,6 +24,7 @@ package com.farsunset.cim.admin.controller;
import com.farsunset.cim.service.CIMSessionService;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.annotation.Resource;
@@ -35,7 +36,7 @@ public class SessionController {
@Resource
private CIMSessionService cimSessionService;
- @RequestMapping(value = "/list")
+ @GetMapping(value = "/list")
public String list(Model model) {
model.addAttribute("sessionList", cimSessionService.list());
return "console/session/manage";
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java b/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java
index 6a98061..3589eb9 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java
@@ -24,6 +24,7 @@ package com.farsunset.cim.api.controller;
import com.farsunset.cim.api.controller.dto.MessageResult;
import com.farsunset.cim.push.DefaultMessagePusher;
import com.farsunset.cim.sdk.server.model.Message;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -44,13 +45,13 @@ public class MessageController {
* @param message
* @return
*/
- @RequestMapping(value = "/dispatch",method=RequestMethod.POST)
+ @PostMapping(value = "/dispatch")
public MessageResult dispatchSend(Message message) {
return send(message);
}
- @RequestMapping(value = "/send",method=RequestMethod.POST)
+ @PostMapping(value = "/send")
public MessageResult send(Message message) {
MessageResult result = new MessageResult();
diff --git a/cim-boot-server/src/main/java/com/farsunset/cim/config/CIMConfig.java b/cim-boot-server/src/main/java/com/farsunset/cim/config/CIMConfig.java
index 96eefba..781dd29 100644
--- a/cim-boot-server/src/main/java/com/farsunset/cim/config/CIMConfig.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/config/CIMConfig.java
@@ -38,11 +38,15 @@ public class CIMConfig implements CIMRequestHandler, ApplicationListener> 8) & 0xff);
- return header;
-
-}
-function onInterceptMessageReceived(message){
- //被强制下线之后，不再继续连接服务端
- if(message.action == ACTION_999){
- manualStop = true;
- }
- //收到消息后，将消息发送给页面
- if(onMessageReceived instanceof Function){
- onMessageReceived(message);
- }
+function onInterceptMessageReceived(message) {
+ /*
+ *被强制下线之后，不再继续连接服务端
+ */
+ if (message.action == ACTION_999) {
+ manualStop = true;
+ }
+ /*
+ *收到消息后，将消息发送给页面
+ */
+ if (onMessageReceived instanceof Function) {
+ onMessageReceived(message);
+ }
}
function getBrowser() {
- var explorer = window.navigator.userAgent.toLowerCase() ;
- // ie
- if (explorer.indexOf("msie") >= 0) {
- var ver=explorer.match(/msie ([\d.]+)/)[1];
- return {name:"IE",version:ver};
- }
- // firefox
- else if (explorer.indexOf("firefox") >= 0) {
- var ver=explorer.match(/firefox\/([\d.]+)/)[1];
- return {name:"Firefox",version:ver};
- }
- // Chrome
- else if(explorer.indexOf("chrome") >= 0){
- var ver=explorer.match(/chrome\/([\d.]+)/)[1];
- return {name:"Chrome",version:ver};
- }
- // Opera
- else if(explorer.indexOf("opera") >= 0){
- var ver=explorer.match(/opera.([\d.]+)/)[1];
- return {name:"Opera",version:ver};
- }
- // Safari
- else if(explorer.indexOf("Safari") >= 0){
- var ver=explorer.match(/version\/([\d.]+)/)[1];
- return {name:"Safari",version:ver};
- }
-
- return {name:"Other",version:"1.0.0"};
+ let explorer = window.navigator.userAgent.toLowerCase();
+ if (explorer.indexOf("msie") >= 0) {
+ let ver = explorer.match(/msie ([\d.]+)/)[1];
+ return {name: "IE", version: ver};
+ }
+ else if (explorer.indexOf("firefox") >= 0) {
+ let ver = explorer.match(/firefox\/([\d.]+)/)[1];
+ return {name: "Firefox", version: ver};
+ }
+ else if (explorer.indexOf("chrome") >= 0) {
+ let ver = explorer.match(/chrome\/([\d.]+)/)[1];
+ return {name: "Chrome", version: ver};
+ }
+ else if (explorer.indexOf("opera") >= 0) {
+ let ver = explorer.match(/opera.([\d.]+)/)[1];
+ return {name: "Opera", version: ver};
+ }
+ else if (explorer.indexOf("Safari") >= 0) {
+ let ver = explorer.match(/version\/([\d.]+)/)[1];
+ return {name: "Safari", version: ver};
+ }
+
+ return {name: "Other", version: "1.0.0"};
}
function generateUUID() {
- var d = new Date().getTime();
- var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
- var r = (d + Math.random()*16)%16 | 0;
- d = Math.floor(d/16);
- return (c=='x' ? r : (r&0x3|0x8)).toString(16);
- });
- return uuid.replace(/-/g,'');
+ let d = new Date().getTime();
+ let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+ let r = (d + Math.random() * 16) % 16 | 0;
+ d = Math.floor(d / 16);
+ return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+ });
+ return uuid.replace(/-/g, '');
}
\ No newline at end of file
diff --git a/cim-client-sdk/cim-android-sdk/.classpath b/cim-client-sdk/cim-android-sdk/.classpath
deleted file mode 100644
index b6fc356..0000000
--- a/cim-client-sdk/cim-android-sdk/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/cim-client-sdk/cim-android-sdk/.gitignore b/cim-client-sdk/cim-android-sdk/.gitignore
new file mode 100644
index 0000000..07827cc
--- /dev/null
+++ b/cim-client-sdk/cim-android-sdk/.gitignore
@@ -0,0 +1,2 @@
+target/
+.idea/
\ No newline at end of file
diff --git a/cim-client-sdk/cim-android-sdk/.project b/cim-client-sdk/cim-android-sdk/.project
deleted file mode 100644
index dab9061..0000000
--- a/cim-client-sdk/cim-android-sdk/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- cim-android-sdk
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder
-
-
-
-
-
- com.genuitec.eclipse.ast.deploy.core.deploymentnature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/cim-client-sdk/cim-android-sdk/.settings/org.eclipse.core.resources.prefs b/cim-client-sdk/cim-android-sdk/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99b2bf9..0000000
--- a/cim-client-sdk/cim-android-sdk/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Oct 15 09:31:41 CST 2014
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/cim-client-sdk/cim-android-sdk/.settings/org.eclipse.jdt.core.prefs b/cim-client-sdk/cim-android-sdk/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d17b672..0000000
--- a/cim-client-sdk/cim-android-sdk/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml b/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml
new file mode 100644
index 0000000..78b2cc5
--- /dev/null
+++ b/cim-client-sdk/cim-android-sdk/cim-android-sdk.iml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/cim-client-sdk/cim-android-sdk/jar.bat b/cim-client-sdk/cim-android-sdk/jar.bat
new file mode 100644
index 0000000..f0b4c1c
--- /dev/null
+++ b/cim-client-sdk/cim-android-sdk/jar.bat
@@ -0,0 +1 @@
+mvn clean package
\ No newline at end of file
diff --git a/cim-client-sdk/cim-android-sdk/jar.sh b/cim-client-sdk/cim-android-sdk/jar.sh
new file mode 100644
index 0000000..f0b4c1c
--- /dev/null
+++ b/cim-client-sdk/cim-android-sdk/jar.sh
@@ -0,0 +1 @@
+mvn clean package
\ No newline at end of file
diff --git a/cim-client-sdk/cim-android-sdk/libs/protobuf-lite-3.0.0.jar b/cim-client-sdk/cim-android-sdk/libs/protobuf-lite-3.0.0.jar
deleted file mode 100644
index 6b2385f..0000000
Binary files a/cim-client-sdk/cim-android-sdk/libs/protobuf-lite-3.0.0.jar and /dev/null differ
diff --git a/cim-client-sdk/cim-android-sdk/pom.xml b/cim-client-sdk/cim-android-sdk/pom.xml
new file mode 100644
index 0000000..4b9249e
--- /dev/null
+++ b/cim-client-sdk/cim-android-sdk/pom.xml
@@ -0,0 +1,59 @@
+
+
+ 4.0.0
+
+ com.farsunset
+ cim-android-sdk
+ 3.8.0
+ jar
+
+
+ UTF-8
+ UTF-8
+ 1.8
+ 3.0.1
+ 4.1.44.Final
+ 1.7.30
+
+
+
+
+
+
+
+ com.google.protobuf
+ protobuf-lite
+ ${protobuf.lite.version}
+
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+
+ android
+ android
+ system
+ 8.0.0
+ ${project.basedir}/libs/android.jar
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.1
+
+ 8
+ 8
+
+
+
+
+
\ No newline at end of file
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMCacheManager.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMCacheManager.java
similarity index 93%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMCacheManager.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMCacheManager.java
index fb895d8..34297f9 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMCacheManager.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMCacheManager.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,9 +39,9 @@ class CIMCacheManager {
public static final String KEY_CIM_DESTROYED = "KEY_CIM_DESTROYED";
- public static final String KEY_CIM_SERVIER_HOST = "KEY_CIM_SERVIER_HOST";
+ public static final String KEY_CIM_SERVER_HOST = "KEY_CIM_SERVER_HOST";
- public static final String KEY_CIM_SERVIER_PORT = "KEY_CIM_SERVIER_PORT";
+ public static final String KEY_CIM_SERVER_PORT = "KEY_CIM_SERVER_PORT";
public static final String KEY_CIM_CONNECTION_STATE = "KEY_CIM_CONNECTION_STATE";
@@ -76,8 +76,9 @@ class CIMCacheManager {
private static void closeQuietly(Cursor cursor) {
try {
- if (cursor != null)
+ if (cursor != null) {
cursor.close();
+ }
} catch (Exception ignore) {
}
}
@@ -88,7 +89,7 @@ class CIMCacheManager {
public static boolean getBoolean(Context context, String key) {
String value = getString(context, key);
- return value == null ? false : Boolean.parseBoolean(value);
+ return Boolean.parseBoolean(value);
}
public static void putInt(Context context, String key, int value) {
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMCacheProvider.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMCacheProvider.java
similarity index 99%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMCacheProvider.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMCacheProvider.java
index 400ff00..010237f 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMCacheProvider.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMCacheProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMConnectorManager.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMConnectorManager.java
similarity index 67%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMConnectorManager.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMConnectorManager.java
index cee775e..67a0ff9 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMConnectorManager.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMConnectorManager.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +21,17 @@
*/
package com.farsunset.cim.sdk.android;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Process;
+import com.farsunset.cim.sdk.android.coder.CIMLogger;
+import com.farsunset.cim.sdk.android.coder.ClientMessageDecoder;
+import com.farsunset.cim.sdk.android.coder.ClientMessageEncoder;
+import com.farsunset.cim.sdk.android.constant.CIMConstant;
+import com.farsunset.cim.sdk.android.model.*;
+
import java.io.IOException;
import java.net.ConnectException;
import java.net.InetSocketAddress;
@@ -31,26 +42,8 @@ import java.util.Random;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore;
-import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicLong;
-import com.farsunset.cim.sdk.android.coder.CIMLogger;
-import com.farsunset.cim.sdk.android.coder.ClientMessageDecoder;
-import com.farsunset.cim.sdk.android.coder.ClientMessageEncoder;
-import com.farsunset.cim.sdk.android.constant.CIMConstant;
-import com.farsunset.cim.sdk.android.model.HeartbeatRequest;
-import com.farsunset.cim.sdk.android.model.HeartbeatResponse;
-import com.farsunset.cim.sdk.android.model.Message;
-import com.farsunset.cim.sdk.android.model.Protobufable;
-import com.farsunset.cim.sdk.android.model.ReplyBody;
-import com.farsunset.cim.sdk.android.model.SentBody;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Process;
-
/**
* 连接服务端管理，cim核心处理类，管理连接，以及消息处理
*
@@ -60,19 +53,19 @@ class CIMConnectorManager{
private static CIMConnectorManager manager;
- private final int READ_BUFFER_SIZE = 2048;
- private final int WRITE_BUFFER_SIZE = 1024;
+ private static final int READ_BUFFER_SIZE = 2048;
+ private static final int WRITE_BUFFER_SIZE = 1024;
- private final int READ_IDLE_TIME = 120 * 1000;
+ private static final int READ_IDLE_TIME = 120 * 1000;
- private final int CONNECT_TIME_OUT = 10 * 1000;
+ private static final int CONNECT_TIME_OUT = 10 * 1000;
- private final int CONNECT_ALIVE_TIME_OUT = 150 * 1000;
+ private static final int CONNECT_ALIVE_TIME_OUT = 150 * 1000;
- private final AtomicLong LAST_READ_TIME = new AtomicLong(0);
+ private static final AtomicLong LAST_READ_TIME = new AtomicLong(0);
- private final CIMLogger LOGGER = CIMLogger.getLogger();
+ private static final CIMLogger LOGGER = CIMLogger.getLogger();
private static final HandlerThread IDLE_HANDLER_THREAD = new HandlerThread("READ-IDLE", Process.THREAD_PRIORITY_BACKGROUND);
@@ -85,19 +78,9 @@ class CIMConnectorManager{
private ByteBuffer readBuffer = ByteBuffer.allocate(READ_BUFFER_SIZE);
- private ExecutorService workerExecutor = Executors.newFixedThreadPool(1,new ThreadFactory() {
- @Override
- public Thread newThread(Runnable r) {
- return new Thread(r,"worker-");
- }
- });
+ private ExecutorService workerExecutor = Executors.newFixedThreadPool(1, r -> new Thread(r,"worker-"));
- private ExecutorService bossExecutor = Executors.newFixedThreadPool(1,new ThreadFactory() {
- @Override
- public Thread newThread(Runnable r) {
- return new Thread(r,"boss-");
- }
- });
+ private ExecutorService bossExecutor = Executors.newFixedThreadPool(1, r -> new Thread(r,"boss-"));
private ClientMessageEncoder messageEncoder = new ClientMessageEncoder();
private ClientMessageDecoder messageDecoder = new ClientMessageDecoder();
@@ -126,7 +109,7 @@ class CIMConnectorManager{
Intent intent = new Intent();
intent.setPackage(context.getPackageName());
- intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED);
+ intent.setAction(CIMConstant.IntentAction.ACTION_CONNECT_FAILED);
context.sendBroadcast(intent);
return;
@@ -136,62 +119,56 @@ class CIMConnectorManager{
return;
}
- bossExecutor.execute(new Runnable() {
- @Override
- public void run() {
-
- if (isConnected()) {
- return;
- }
-
- LOGGER.startConnect(host, port);
-
- CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_CONNECTION_STATE, false);
-
- try {
-
- semaphore.acquire();
-
- socketChannel = SocketChannel.open();
- socketChannel.configureBlocking(true);
- socketChannel.socket().setTcpNoDelay(true);
- socketChannel.socket().setKeepAlive(true);
- socketChannel.socket().setReceiveBufferSize(READ_BUFFER_SIZE);
- socketChannel.socket().setSendBufferSize(WRITE_BUFFER_SIZE);
-
- socketChannel.socket().connect(new InetSocketAddress(host, port),CONNECT_TIME_OUT);
-
- semaphore.release();
-
- handelConnectedEvent();
-
-
- int result = -1;
-
- while((result = socketChannel.read(readBuffer)) > 0) {
-
- if(readBuffer.position() == readBuffer.capacity()) {
- extendByteBuffer();
- }
-
- handelSocketReadEvent(result);
-
+ bossExecutor.execute(() -> {
+
+ if (isConnected()) {
+ return;
+ }
+
+ LOGGER.startConnect(host, port);
+
+ CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_CONNECTION_STATE, false);
+
+ try {
+
+ semaphore.acquire();
+
+ socketChannel = SocketChannel.open();
+ socketChannel.configureBlocking(true);
+ socketChannel.socket().setTcpNoDelay(true);
+ socketChannel.socket().setKeepAlive(true);
+ socketChannel.socket().setReceiveBufferSize(READ_BUFFER_SIZE);
+ socketChannel.socket().setSendBufferSize(WRITE_BUFFER_SIZE);
+
+ socketChannel.socket().connect(new InetSocketAddress(host, port),CONNECT_TIME_OUT);
+
+ semaphore.release();
+
+ handelConnectedEvent();
+
+
+ int result = -1;
+
+ while((result = socketChannel.read(readBuffer)) > 0) {
+
+ if(readBuffer.position() == readBuffer.capacity()) {
+ extendByteBuffer();
}
-
+
handelSocketReadEvent(result);
-
- }catch(ConnectException ignore){
- semaphore.release();
- handleConnectAbortedEvent();
- }catch(SocketTimeoutException ignore){
- semaphore.release();
- handleConnectAbortedEvent();
- }catch(IOException ignore) {
- semaphore.release();
- handelDisconnectedEvent();
- }catch(InterruptedException ignore) {
- semaphore.release();
+
}
+
+ handelSocketReadEvent(result);
+
+ }catch(ConnectException | SocketTimeoutException ignore){
+ semaphore.release();
+ handleConnectAbortedEvent();
+ } catch(IOException ignore) {
+ semaphore.release();
+ handelDisconnectedEvent();
+ }catch(InterruptedException ignore) {
+ semaphore.release();
}
});
}
@@ -229,32 +206,28 @@ class CIMConnectorManager{
return;
}
- workerExecutor.execute(new Runnable() {
-
- @Override
- public void run() {
- int result = 0;
- try {
-
- semaphore.acquire();
-
- ByteBuffer buffer = messageEncoder.encode(body);
- while(buffer.hasRemaining()){
- result += socketChannel.write(buffer);
- }
-
- } catch (Exception e) {
- result = -1;
- }finally {
-
- semaphore.release();
-
- if(result <= 0) {
- closeSession();
- }else {
- messageSent(body);
- }
- }
+ workerExecutor.execute(() -> {
+ int result = 0;
+ try {
+
+ semaphore.acquire();
+
+ ByteBuffer buffer = messageEncoder.encode(body);
+ while(buffer.hasRemaining()){
+ result += socketChannel.write(buffer);
+ }
+
+ } catch (Exception e) {
+ result = -1;
+ }finally {
+
+ semaphore.release();
+
+ if(result <= 0) {
+ closeSession();
+ }else {
+ messageSent(body);
+ }
}
});
@@ -268,7 +241,7 @@ class CIMConnectorManager{
Intent intent = new Intent();
intent.setPackage(context.getPackageName());
- intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_SUCCESSED);
+ intent.setAction(CIMConstant.IntentAction.ACTION_CONNECT_FINISHED);
context.sendBroadcast(intent);
}
@@ -298,9 +271,8 @@ class CIMConnectorManager{
LOGGER.sessionIdle(socketChannel);
- /**
+ /*
* 用于解决，wifi情况下。偶而路由器与服务器断开连接时，客户端并没及时收到关闭事件 导致这样的情况下当前连接无效也不会重连的问题
- *
*/
if (System.currentTimeMillis() - LAST_READ_TIME.get() >= CONNECT_ALIVE_TIME_OUT) {
closeSession();
@@ -337,13 +309,14 @@ class CIMConnectorManager{
if (message instanceof SentBody) {
Intent intent = new Intent();
intent.setPackage(context.getPackageName());
- intent.setAction(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED);
+ intent.setAction(CIMConstant.IntentAction.ACTION_SEND_FINISHED);
intent.putExtra(SentBody.class.getName(), (SentBody) message);
context.sendBroadcast(intent);
}
}
private Handler idleHandler = new Handler(IDLE_HANDLER_THREAD.getLooper()) {
+ @Override
public void handleMessage(android.os.Message m) {
sessionIdle();
}
@@ -355,13 +328,13 @@ class CIMConnectorManager{
private void handleConnectAbortedEvent() {
- long interval = CIMConstant.RECONN_INTERVAL_TIME - (5 * 1000 - new Random().nextInt(15 * 1000));
+ long interval = CIMConstant.RECONNECT_INTERVAL_TIME - (5 * 1000 - new Random().nextInt(15 * 1000));
LOGGER.connectFailure(interval);
Intent intent = new Intent();
intent.setPackage(context.getPackageName());
- intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED);
+ intent.setAction(CIMConstant.IntentAction.ACTION_CONNECT_FAILED);
intent.putExtra("interval", interval);
context.sendBroadcast(intent);
@@ -374,7 +347,7 @@ class CIMConnectorManager{
idleHandler.sendEmptyMessageDelayed(0, READ_IDLE_TIME);
}
- private void handelSocketReadEvent(int result) throws IOException {
+ private void handelSocketReadEvent(int result) {
if(result == -1) {
closeSession();
@@ -395,7 +368,7 @@ class CIMConnectorManager{
if(isHeartbeatRequest(message)) {
- send(getHeartbeatResponse());
+ send(HeartbeatResponse.getInstance());
return;
}
@@ -425,11 +398,7 @@ class CIMConnectorManager{
idleHandler.sendEmptyMessageDelayed(0, READ_IDLE_TIME);
}
-
- private HeartbeatResponse getHeartbeatResponse() {
- return HeartbeatResponse.getInstance();
- }
private boolean isHeartbeatRequest(Object data) {
return data instanceof HeartbeatRequest;
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMEventBroadcastReceiver.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventBroadcastReceiver.java
similarity index 71%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMEventBroadcastReceiver.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventBroadcastReceiver.java
index 111a267..dc7a3ee 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMEventBroadcastReceiver.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventBroadcastReceiver.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,16 +21,15 @@
*/
package com.farsunset.cim.sdk.android;
-import com.farsunset.cim.sdk.android.constant.CIMConstant;
-import com.farsunset.cim.sdk.android.model.Message;
-import com.farsunset.cim.sdk.android.model.ReplyBody;
-import com.farsunset.cim.sdk.android.model.SentBody;
-
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.os.Build;
+import com.farsunset.cim.sdk.android.constant.CIMConstant;
+import com.farsunset.cim.sdk.android.model.Message;
+import com.farsunset.cim.sdk.android.model.ReplyBody;
+import com.farsunset.cim.sdk.android.model.SentBody;
/**
* 消息入口，所有消息都会经过这里
@@ -45,20 +44,22 @@ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver {
this.context = context;
+ String action = intent.getAction();
+
/*
* 操作事件广播，用于提高service存活率
*/
- if (intent.getAction().equals(Intent.ACTION_USER_PRESENT)
- || intent.getAction().equals(Intent.ACTION_POWER_CONNECTED)
- || intent.getAction().equals(Intent.ACTION_POWER_DISCONNECTED)) {
+ if (Intent.ACTION_USER_PRESENT.equals(action)
+ || Intent.ACTION_POWER_CONNECTED.equals(action)
+ || Intent.ACTION_POWER_DISCONNECTED.equals(action)) {
startPushService();
}
/*
* 设备网络状态变化事件
*/
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_NETWORK_CHANGED)
- ||intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
+ if (CIMConstant.IntentAction.ACTION_NETWORK_CHANGED.equals(action)
+ ||ConnectivityManager.CONNECTIVITY_ACTION.equals(action)) {
onDevicesNetworkChanged();
}
@@ -66,51 +67,51 @@ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver {
/*
* cim断开服务器事件
*/
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED)) {
+ if (CIMConstant.IntentAction.ACTION_CONNECTION_CLOSED.equals(action)) {
onInnerConnectionClosed();
}
/*
* cim连接服务器失败事件
*/
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED)) {
- long interval = intent.getLongExtra("interval", CIMConstant.RECONN_INTERVAL_TIME);
- onConnectionFailed(interval);
+ if (CIMConstant.IntentAction.ACTION_CONNECT_FAILED.equals(action)) {
+ long interval = intent.getLongExtra("interval", CIMConstant.RECONNECT_INTERVAL_TIME);
+ onInnerConnectFailed(interval);
}
/*
* cim连接服务器成功事件
*/
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_SUCCESSED)) {
- onInnerConnectionSuccessed();
+ if (CIMConstant.IntentAction.ACTION_CONNECT_FINISHED.equals(action)) {
+ onInnerConnectFinished();
}
/*
* 收到推送消息事件
*/
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_MESSAGE_RECEIVED)) {
+ if (CIMConstant.IntentAction.ACTION_MESSAGE_RECEIVED.equals(action)) {
onInnerMessageReceived((Message) intent.getSerializableExtra(Message.class.getName()), intent);
}
/*
- * 获取收到replybody成功事件
+ * 获取收到replyBody成功事件
*/
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_REPLY_RECEIVED)) {
+ if (CIMConstant.IntentAction.ACTION_REPLY_RECEIVED.equals(action)) {
onReplyReceived((ReplyBody) intent.getSerializableExtra(ReplyBody.class.getName()));
}
/*
- * 获取sendbody发送成功事件
+ * 获取sendBody发送成功事件
*/
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED)) {
+ if (CIMConstant.IntentAction.ACTION_SEND_FINISHED.equals(action)) {
onSentSucceed((SentBody) intent.getSerializableExtra(SentBody.class.getName()));
}
/*
* 重新连接，如果断开的话
*/
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_RECOVERY)) {
+ if (CIMConstant.IntentAction.ACTION_CONNECTION_RECOVERY.equals(action)) {
connect(0);
}
}
@@ -138,21 +139,21 @@ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver {
onConnectionClosed();
}
- private void onConnectionFailed(long reinterval) {
+ private void onInnerConnectFailed(long interval) {
if (CIMPushManager.isNetworkConnected(context)) {
- onConnectionFailed();
+ onConnectFailed();
- connect(reinterval);
+ connect(interval);
}
}
- private void onInnerConnectionSuccessed() {
+ private void onInnerConnectFinished() {
CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_CONNECTION_STATE, true);
boolean autoBind = CIMPushManager.autoBindAccount(context);
- onConnectionSuccessed(autoBind);
+ onConnectFinished(autoBind);
}
private void onDevicesNetworkChanged() {
@@ -171,7 +172,7 @@ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver {
CIMPushManager.startService(context,serviceIntent);
}
- private void onInnerMessageReceived(com.farsunset.cim.sdk.android.model.Message message, Intent intent) {
+ private void onInnerMessageReceived(Message message, Intent intent) {
if (isForceOfflineMessage(message.getAction())) {
CIMPushManager.stop(context);
}
@@ -182,31 +183,37 @@ public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver {
private boolean isForceOfflineMessage(String action) {
return CIMConstant.MessageAction.ACTION_999.equals(action);
}
-
- public abstract void onMessageReceived(com.farsunset.cim.sdk.android.model.Message message, Intent intent);
+
+ /**
+ * 接收消息实现方法
+ * @param message
+ * @param intent
+ */
+ public abstract void onMessageReceived(Message message, Intent intent);
public void onNetworkChanged() {
CIMListenerManager.notifyOnNetworkChanged(CIMPushManager.getNetworkInfo(context));
}
- public void onConnectionSuccessed(boolean hasAutoBind) {
- CIMListenerManager.notifyOnConnectionSuccessed(hasAutoBind);
+ public void onConnectFinished(boolean hasAutoBind) {
+ CIMListenerManager.notifyOnConnectFinished(hasAutoBind);
+ }
+
+ public void onConnectFailed() {
+ CIMListenerManager.notifyOnConnectFailed();
}
public void onConnectionClosed() {
CIMListenerManager.notifyOnConnectionClosed();
}
- public void onConnectionFailed() {
- CIMListenerManager.notifyOnConnectionFailed();
- }
public void onReplyReceived(ReplyBody body) {
CIMListenerManager.notifyOnReplyReceived(body);
}
public void onSentSucceed(SentBody body) {
- CIMListenerManager.notifyOnSentSucceed(body);
+ CIMListenerManager.notifyOnSendFinished(body);
}
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMEventListener.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventListener.java
similarity index 85%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMEventListener.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventListener.java
index b904f54..606e338 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMEventListener.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMEventListener.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,6 @@
package com.farsunset.cim.sdk.android;
import android.net.NetworkInfo;
-
import com.farsunset.cim.sdk.android.model.Message;
import com.farsunset.cim.sdk.android.model.ReplyBody;
import com.farsunset.cim.sdk.android.model.SentBody;
@@ -42,31 +41,31 @@ public interface CIMEventListener {
/**
* 当调用CIMPushManager.sendRequest()向服务端发送请求，获得相应时调用
*
- * @param replybody
+ * @param body
*/
- void onReplyReceived(ReplyBody replybody);
+ void onReplyReceived(ReplyBody body);
/**
* 当调用CIMPushManager.sendRequest()向服务端发送请求成功时
- *
+ *
* @param body
*/
- void onSentSuccessed(SentBody body);
+ void onSendFinished(SentBody body);
/**
* 当手机网络发生变化时调用
*
- * @param networkinfo
+ * @param info
*/
- void onNetworkChanged(NetworkInfo networkinfo);
+ void onNetworkChanged(NetworkInfo info);
/**
* 当连接服务器成功时回调
*
* @param hasAutoBind
- * : true 已经自动绑定账号到服务器了，不需要再手动调用bindAccount
+ * true 已经自动绑定账号到服务器了，不需要再手动调用bindAccount
*/
- void onConnectionSuccessed(boolean hasAutoBind);
+ void onConnectFinished(boolean hasAutoBind);
/**
* 当断开服务器连接的时候回调
@@ -78,10 +77,11 @@ public interface CIMEventListener {
* 当连接服务器失败的时候回调
*
*/
- void onConnectionFailed();
+ void onConnectFailed();
/**
* 监听器在容器里面的排序。值越大则越先接收
+ * @return 排序 值越大优先级越高
*/
int getEventDispatchOrder();
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMListenerManager.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMListenerManager.java
similarity index 78%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMListenerManager.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMListenerManager.java
index b5b18b0..da64617 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMListenerManager.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMListenerManager.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,16 +21,16 @@
*/
package com.farsunset.cim.sdk.android;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-
+import android.net.NetworkInfo;
+import android.util.Log;
import com.farsunset.cim.sdk.android.model.Message;
import com.farsunset.cim.sdk.android.model.ReplyBody;
import com.farsunset.cim.sdk.android.model.SentBody;
-import android.net.NetworkInfo;
-import android.util.Log;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
/**
* CIM 消息监听器管理
@@ -38,20 +38,26 @@ import android.util.Log;
public class CIMListenerManager {
private static ArrayList cimListeners = new ArrayList();
- private static CIMMessageReceiveComparator comparator = new CIMMessageReceiveComparator();
+ private static ReceiveComparator comparator = new ReceiveComparator();
+
+ private CIMListenerManager(){
+
+ }
public static void registerMessageListener(CIMEventListener listener) {
if (!cimListeners.contains(listener)) {
cimListeners.add(listener);
- Collections.sort(cimListeners, comparator);
+ Collections.sort(cimListeners,comparator);
}
}
public static void removeMessageListener(CIMEventListener listener) {
- for (int i = 0; i < cimListeners.size(); i++) {
- if (listener.getClass() == cimListeners.get(i).getClass()) {
- cimListeners.remove(i);
+ Iterator iterable = cimListeners.iterator();
+ while (iterable.hasNext()){
+ CIMEventListener target = iterable.next();
+ if (listener.getClass() == target.getClass()) {
+ iterable.remove();
}
}
}
@@ -62,9 +68,9 @@ public class CIMListenerManager {
}
}
- public static void notifyOnConnectionSuccessed(boolean hasAutoBind) {
+ public static void notifyOnConnectFinished(boolean hasAutoBind) {
for (CIMEventListener listener : cimListeners) {
- listener.onConnectionSuccessed(hasAutoBind);
+ listener.onConnectFinished(hasAutoBind);
}
}
@@ -80,9 +86,9 @@ public class CIMListenerManager {
}
}
- public static void notifyOnConnectionFailed() {
+ public static void notifyOnConnectFailed() {
for (CIMEventListener listener : cimListeners) {
- listener.onConnectionFailed();
+ listener.onConnectFailed();
}
}
@@ -92,13 +98,13 @@ public class CIMListenerManager {
}
}
- public static void notifyOnSentSucceed(SentBody body) {
+ public static void notifyOnSendFinished(SentBody body) {
for (CIMEventListener listener : cimListeners) {
- listener.onSentSuccessed(body);
+ listener.onSendFinished(body);
}
}
- public static void destory() {
+ public static void destroy() {
cimListeners.clear();
}
@@ -111,14 +117,14 @@ public class CIMListenerManager {
/**
* 消息接收activity的接收顺序排序，CIM_RECEIVE_ORDER倒序
*/
- private static class CIMMessageReceiveComparator implements Comparator {
+ private static class ReceiveComparator implements Comparator {
@Override
public int compare(CIMEventListener arg1, CIMEventListener arg2) {
int order1 = arg1.getEventDispatchOrder();
int order2 = arg2.getEventDispatchOrder();
- return order2 - order1;
+ return Integer.compare(order2,order1);
}
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushManager.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java
similarity index 81%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushManager.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java
index 74d8167..5f55a2b 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushManager.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushManager.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,8 +21,6 @@
*/
package com.farsunset.cim.sdk.android;
-import java.util.UUID;
-
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
@@ -31,11 +29,12 @@ import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Build;
import android.text.TextUtils;
-
import com.farsunset.cim.sdk.android.coder.CIMLogger;
import com.farsunset.cim.sdk.android.constant.CIMConstant;
import com.farsunset.cim.sdk.android.model.SentBody;
+import java.util.UUID;
+
/**
* CIM 功能接口
*/
@@ -49,18 +48,12 @@ public class CIMPushManager {
protected static String ACTION_CLOSE_CIM_CONNECTION = "ACTION_CLOSE_CIM_CONNECTION";
- protected static String ACTION_SET_LOGGER_EANABLE = "ACTION_SET_LOGGER_EANABLE";
+ protected static String ACTION_SET_LOGGER_EATABLE = "ACTION_SET_LOGGER_EATABLE";
protected static String KEY_SEND_BODY = "KEY_SEND_BODY";
- protected static String KEY_CIM_CONNECTION_STATUS = "KEY_CIM_CONNECTION_STATUS";
-
/**
* 初始化,连接服务端，在程序启动页或者 在Application里调用
- *
- * @param context
- * @param ip
- * @param port
*/
public static void connect(Context context, String host, int port) {
@@ -70,8 +63,8 @@ public class CIMPushManager {
}
- CIMCacheManager.putString(context, CIMCacheManager.KEY_CIM_SERVIER_HOST, host);
- CIMCacheManager.putInt(context, CIMCacheManager.KEY_CIM_SERVIER_PORT, port);
+ CIMCacheManager.putString(context, CIMCacheManager.KEY_CIM_SERVER_HOST, host);
+ CIMCacheManager.putInt(context, CIMCacheManager.KEY_CIM_SERVER_PORT, port);
CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED, false);
CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_MANUAL_STOP, false);
@@ -88,20 +81,17 @@ public class CIMPushManager {
public static void setLoggerEnable(Context context,boolean enable) {
Intent serviceIntent = new Intent(context, CIMPushService.class);
serviceIntent.putExtra(CIMPushService.KEY_LOGGER_ENABLE, enable);
- serviceIntent.setAction(ACTION_SET_LOGGER_EANABLE);
+ serviceIntent.setAction(ACTION_SET_LOGGER_EATABLE);
startService(context,serviceIntent);
}
/**
* 设置一个账号登录到服务端
- *
- * @param account
- * 用户唯一ID
*/
public static void bindAccount(Context context, String account) {
- if (isDestoryed(context) || account == null || account.trim().length() == 0) {
+ if (isDestroyed(context) || account == null || account.trim().length() == 0) {
return;
}
@@ -114,28 +104,24 @@ public class CIMPushManager {
CIMCacheManager.putBoolean(context, CIMCacheManager.KEY_MANUAL_STOP, false);
CIMCacheManager.putString(context, CIMCacheManager.KEY_ACCOUNT, account);
- String deviceId = CIMCacheManager.getString(context, CIMCacheManager.KEY_DEVICE_ID);
- if (TextUtils.isEmpty(deviceId)) {
- deviceId = UUID.randomUUID().toString().replaceAll("-", "").toUpperCase();
- CIMCacheManager.putString(context, CIMCacheManager.KEY_DEVICE_ID, deviceId);
- }
SentBody sent = new SentBody();
sent.setKey(CIMConstant.RequestKey.CLIENT_BIND);
sent.put("account", account);
- sent.put("deviceId", deviceId);
+ sent.put("deviceId", getDeviceId(context));
sent.put("channel", "android");
- sent.put("device", android.os.Build.MODEL);
- sent.put("version", getVersionName(context));
- sent.put("osVersion", android.os.Build.VERSION.RELEASE);
+ sent.put("device", Build.MODEL);
+ sent.put("appVersion", getVersionName(context));
+ sent.put("osVersion", Build.VERSION.RELEASE);
sent.put("packageName", context.getPackageName());
+ sent.setTimestamp(System.currentTimeMillis());
sendRequest(context, sent);
}
protected static boolean autoBindAccount(Context context) {
String account = CIMCacheManager.getString(context, CIMCacheManager.KEY_ACCOUNT);
- if (account == null || account.trim().length() == 0 || isDestoryed(context)) {
+ if (account == null || account.trim().length() == 0 || isDestroyed(context)) {
return false;
}
@@ -146,13 +132,10 @@ public class CIMPushManager {
/**
* 发送一个CIM请求
- *
- * @param context
- * @body
*/
public static void sendRequest(Context context, SentBody body) {
- if (isDestoryed(context) || isStoped(context)) {
+ if (isDestroyed(context) || isStopped(context)) {
return;
}
@@ -165,12 +148,10 @@ public class CIMPushManager {
/**
* 停止接受推送，将会退出当前账号登录，端口与服务端的连接
- *
- * @param context
*/
public static void stop(Context context) {
- if (isDestoryed(context)) {
+ if (isDestroyed(context)) {
return;
}
@@ -184,8 +165,6 @@ public class CIMPushManager {
/**
* 完全销毁CIM，一般用于完全退出程序，调用resume将不能恢复
- *
- * @param context
*/
public static void destroy(Context context) {
@@ -198,23 +177,21 @@ public class CIMPushManager {
/**
* 重新恢复接收推送，重新连接服务端，并登录当前账号
- *
- * @param context
*/
public static void resume(Context context) {
- if (isDestoryed(context)) {
+ if (isDestroyed(context)) {
return;
}
autoBindAccount(context);
}
- public static boolean isDestoryed(Context context) {
+ public static boolean isDestroyed(Context context) {
return CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_CIM_DESTROYED);
}
- public static boolean isStoped(Context context) {
+ public static boolean isStopped(Context context) {
return CIMCacheManager.getBoolean(context, CIMCacheManager.KEY_MANUAL_STOP);
}
@@ -243,15 +220,28 @@ public class CIMPushManager {
private static String getVersionName(Context context) {
- String versionName = null;
+
try {
PackageInfo mPackageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
- versionName = mPackageInfo.versionName;
+ return mPackageInfo.versionName;
} catch (NameNotFoundException ignore) {
}
- return versionName;
+ return null;
+ }
+
+ private static String getDeviceId(Context context){
+
+ String currDeviceId = CIMCacheManager.getString(context, CIMCacheManager.KEY_DEVICE_ID);
+
+ if (!TextUtils.isEmpty(currDeviceId)) {
+ return currDeviceId;
+ }
+
+ String deviceId = UUID.randomUUID().toString().replaceAll("-", "").toUpperCase();
+
+ CIMCacheManager.putString(context, CIMCacheManager.KEY_DEVICE_ID,deviceId);
+
+ return deviceId;
}
-
-
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushService.java
similarity index 95%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushService.java
index 82bb1ab..d1fc5b1 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/CIMPushService.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/CIMPushService.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,6 @@ import android.os.Build;
import android.os.Handler;
import android.os.IBinder;
import android.util.Log;
-
import com.farsunset.cim.sdk.android.coder.CIMLogger;
import com.farsunset.cim.sdk.android.constant.CIMConstant;
import com.farsunset.cim.sdk.android.model.SentBody;
@@ -122,9 +121,7 @@ public class CIMPushService extends Service {
startForeground(NOTIFICATION_ID,notification);
}
- intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent);
-
- String action = intent.getAction();
+ String action = intent == null ? CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE : intent.getAction();
if (CIMPushManager.ACTION_CREATE_CIM_CONNECTION.equals(action)) {
connect(intent.getLongExtra(KEY_DELAYED_TIME, 0));
@@ -142,7 +139,7 @@ public class CIMPushService extends Service {
handleKeepAlive();
}
- if (CIMPushManager.ACTION_SET_LOGGER_EANABLE.equals(action)) {
+ if (CIMPushManager.ACTION_SET_LOGGER_EATABLE.equals(action)) {
boolean enable = intent.getBooleanExtra(KEY_LOGGER_ENABLE, true);
CIMLogger.getLogger().debugMode(enable);
}
@@ -167,12 +164,12 @@ public class CIMPushService extends Service {
private void connect() {
- if(CIMPushManager.isDestoryed(this) || CIMPushManager.isStoped(this)) {
+ if(CIMPushManager.isDestroyed(this) || CIMPushManager.isStopped(this)) {
return;
}
- String host = CIMCacheManager.getString(this, CIMCacheManager.KEY_CIM_SERVIER_HOST);
- int port = CIMCacheManager.getInt(this, CIMCacheManager.KEY_CIM_SERVIER_PORT);
+ String host = CIMCacheManager.getString(this, CIMCacheManager.KEY_CIM_SERVER_HOST);
+ int port = CIMCacheManager.getInt(this, CIMCacheManager.KEY_CIM_SERVER_PORT);
if(host == null || host.trim().length() == 0 || port <= 0) {
Log.e(this.getClass().getSimpleName(), "Invalid hostname or port. host:" + host + " port:" + port);
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/coder/CIMLogger.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/CIMLogger.java
similarity index 95%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/coder/CIMLogger.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/CIMLogger.java
index 0cb18f5..4249393 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/coder/CIMLogger.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/CIMLogger.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +21,10 @@
*/
package com.farsunset.cim.sdk.android.coder;
-import java.nio.channels.SocketChannel;
-
import android.util.Log;
+import java.nio.channels.SocketChannel;
+
/**
* 日志打印，添加session 的id和ip address
@@ -105,7 +105,7 @@ public class CIMLogger {
public void connectState(boolean isConnected,boolean isManualStop,boolean isDestroyed) {
if(debug) {
- Log.d(TAG,"CONNECTED:" + isConnected + " STOPED:"+isManualStop+ " DESTROYED:"+isDestroyed);
+ Log.d(TAG,"CONNECTED:" + isConnected + " STOPPED:"+isManualStop+ " DESTROYED:"+isDestroyed);
}
}
private String getSessionInfo(SocketChannel session) {
@@ -118,7 +118,7 @@ public class CIMLogger {
try {
if (session.socket().getLocalAddress() != null) {
- builder.append(" L:").append(session.socket().getLocalAddress()+":"+session.socket().getLocalPort());
+ builder.append(" L:").append(session.socket().getLocalAddress()).append(":").append(session.socket().getLocalPort());
}
} catch (Exception ignore) {
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java
similarity index 78%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java
index 08738a0..33235fb 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,9 +22,6 @@
package com.farsunset.cim.sdk.android.coder;
-import java.nio.ByteBuffer;
-
-
import com.farsunset.cim.sdk.android.constant.CIMConstant;
import com.farsunset.cim.sdk.android.model.HeartbeatRequest;
import com.farsunset.cim.sdk.android.model.Message;
@@ -33,43 +30,47 @@ import com.farsunset.cim.sdk.android.model.proto.MessageProto;
import com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto;
import com.google.protobuf.InvalidProtocolBufferException;
+import java.nio.ByteBuffer;
+
/**
* 客户端消息解码
*/
public class ClientMessageDecoder {
- public Object doDecode(ByteBuffer iobuffer) {
+ public Object doDecode(ByteBuffer buffer) {
- /**
+ /*
* 消息头3位
*/
- if (iobuffer.remaining() < CIMConstant.DATA_HEADER_LENGTH) {
+ if (buffer.remaining() < CIMConstant.DATA_HEADER_LENGTH) {
return null;
}
- iobuffer.mark();
+ buffer.mark();
- byte conetnType = iobuffer.get();
+ byte type = buffer.get();
- byte lv = iobuffer.get();// int 低位
- byte hv = iobuffer.get();// int 高位
+ byte lv = buffer.get();
+ byte hv = buffer.get();
- int conetnLength = getContentLength(lv, hv);
+ int length = getContentLength(lv, hv);
- // 如果消息体没有接收完整，则重置读取，等待下一次重新读取
- if (conetnLength > iobuffer.remaining()) {
- iobuffer.reset();
+ /*
+ *如果消息体没有接收完整，则重置读取，等待下一次重新读取
+ */
+ if (length > buffer.remaining()) {
+ buffer.reset();
return null;
}
- byte[] dataBytes = new byte[conetnLength];
- iobuffer.get(dataBytes, 0, conetnLength);
+ byte[] dataBytes = new byte[length];
+ buffer.get(dataBytes, 0, length);
- iobuffer.position(0);
+ buffer.position(0);
try {
- return mappingMessageObject(dataBytes, conetnType);
+ return mappingMessageObject(dataBytes, type);
} catch (InvalidProtocolBufferException e) {
return null;
}
@@ -79,11 +80,10 @@ public class ClientMessageDecoder {
private Object mappingMessageObject(byte[] bytes, byte type) throws InvalidProtocolBufferException {
if (CIMConstant.ProtobufType.S_H_RQ == type) {
- HeartbeatRequest request = HeartbeatRequest.getInstance();
- return request;
+ return HeartbeatRequest.getInstance();
}
- if (CIMConstant.ProtobufType.REPLYBODY == type) {
+ if (CIMConstant.ProtobufType.REPLY_BODY == type) {
ReplyBodyProto.Model bodyProto = ReplyBodyProto.Model.parseFrom(bytes);
ReplyBody body = new ReplyBody();
body.setKey(bodyProto.getKey());
@@ -115,15 +115,11 @@ public class ClientMessageDecoder {
/**
* 解析消息体长度
- *
- * @param type
- * @param length
- * @return
*/
private int getContentLength(byte lv, byte hv) {
int l = (lv & 0xff);
int h = (hv & 0xff);
- return (l | (h <<= 8));
+ return (l | h << 8);
}
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/coder/ClientMessageEncoder.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageEncoder.java
similarity index 86%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/coder/ClientMessageEncoder.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageEncoder.java
index 1fae3aa..60dbe1c 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/coder/ClientMessageEncoder.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/coder/ClientMessageEncoder.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,11 +21,11 @@
*/
package com.farsunset.cim.sdk.android.coder;
-import java.nio.ByteBuffer;
-
import com.farsunset.cim.sdk.android.constant.CIMConstant;
import com.farsunset.cim.sdk.android.model.Protobufable;
+import java.nio.ByteBuffer;
+
/**
* 客户端消息发送前进行编码
*/
@@ -36,22 +36,18 @@ public class ClientMessageEncoder {
Protobufable data = (Protobufable) object;
byte[] byteArray = data.getByteArray();
- ByteBuffer iobuffer = ByteBuffer.allocate(byteArray.length + CIMConstant.DATA_HEADER_LENGTH);
+ ByteBuffer buffer = ByteBuffer.allocate(byteArray.length + CIMConstant.DATA_HEADER_LENGTH);
- iobuffer.put(createHeader(data.getType(), byteArray.length));
- iobuffer.put(byteArray);
- iobuffer.flip();
+ buffer.put(createHeader(data.getType(), byteArray.length));
+ buffer.put(byteArray);
+ buffer.flip();
- return iobuffer;
+ return buffer;
}
/**
* 消息体最大为65535
- *
- * @param type
- * @param length
- * @return
*/
private byte[] createHeader(byte type, int length) {
byte[] header = new byte[CIMConstant.DATA_HEADER_LENGTH];
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/constant/CIMConstant.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/constant/CIMConstant.java
similarity index 68%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/constant/CIMConstant.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/constant/CIMConstant.java
index 79dd94e..b52d9aa 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/constant/CIMConstant.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/constant/CIMConstant.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,12 +26,14 @@ package com.farsunset.cim.sdk.android.constant;
*/
public interface CIMConstant {
- long RECONN_INTERVAL_TIME = 30 * 1000;
+ long RECONNECT_INTERVAL_TIME = 30 * 1000;
- // 消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度
+ /**
+ 消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度
+ */
int DATA_HEADER_LENGTH = 3;
- public static interface ReturnCode {
+ interface ReturnCode {
String CODE_404 = "404";
@@ -47,15 +49,15 @@ public interface CIMConstant {
}
- public static interface ProtobufType {
+ interface ProtobufType {
byte C_H_RS = 0;
byte S_H_RQ = 1;
byte MESSAGE = 2;
- byte SENTBODY = 3;
- byte REPLYBODY = 4;
+ byte SENT_BODY = 3;
+ byte REPLY_BODY = 4;
}
- public static interface RequestKey {
+ interface RequestKey {
String CLIENT_BIND = "client_bind";
@@ -63,36 +65,54 @@ public interface CIMConstant {
}
- public static interface MessageAction {
+ interface MessageAction {
- // 被其他设备登录挤下线消息
+ /*
+ 被其他设备登录挤下线消息
+ */
String ACTION_999 = "999";
}
- public static interface IntentAction {
+ interface IntentAction {
- // 消息广播action
+ /*
+ 消息广播action
+ */
String ACTION_MESSAGE_RECEIVED = "com.farsunset.cim.MESSAGE_RECEIVED";
- // 发送sendbody成功广播
- String ACTION_SENT_SUCCESSED = "com.farsunset.cim.SENT_SUCCESSED";
+ /*
+ 发送sendBody成功广播
+ */
+ String ACTION_SEND_FINISHED = "com.farsunset.cim.SEND_FINISHED";
- // 链接意外关闭广播
+ /*
+ 链接意外关闭广播
+ */
String ACTION_CONNECTION_CLOSED = "com.farsunset.cim.CONNECTION_CLOSED";
- // 链接失败广播
- String ACTION_CONNECTION_FAILED = "com.farsunset.cim.CONNECTION_FAILED";
+ /*
+ 链接失败广播
+ */
+ String ACTION_CONNECT_FAILED = "com.farsunset.cim.CONNECT_FAILED";
- // 链接成功广播
- String ACTION_CONNECTION_SUCCESSED = "com.farsunset.cim.CONNECTION_SUCCESSED";
+ /*
+ 链接成功广播
+ */
+ String ACTION_CONNECT_FINISHED = "com.farsunset.cim.CONNECT_FINISHED";
- // 发送sendbody成功后获得replaybody回应广播
+ /*
+ 发送sendBody成功后获得replayBody回应广播
+ */
String ACTION_REPLY_RECEIVED = "com.farsunset.cim.REPLY_RECEIVED";
- // 网络变化广播
+ /*
+ 网络变化广播
+ */
String ACTION_NETWORK_CHANGED = "com.farsunset.cim.NETWORK_CHANGED";
- // 重试连接
+ /*
+ 重试连接
+ */
String ACTION_CONNECTION_RECOVERY = "com.farsunset.cim.CONNECTION_RECOVERY";
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/HeartbeatRequest.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/HeartbeatRequest.java
similarity index 99%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/HeartbeatRequest.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/HeartbeatRequest.java
index 005964d..f6d4d98 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/HeartbeatRequest.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/HeartbeatRequest.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +21,10 @@
*/
package com.farsunset.cim.sdk.android.model;
-import java.io.Serializable;
-
import com.farsunset.cim.sdk.android.constant.CIMConstant;
+import java.io.Serializable;
+
/**
* 服务端心跳请求
*
@@ -50,6 +50,7 @@ public class HeartbeatRequest implements Serializable, Protobufable {
return CMD_HEARTBEAT_REQUEST.getBytes();
}
+ @Override
public String toString() {
return TAG;
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/HeartbeatResponse.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/HeartbeatResponse.java
similarity index 99%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/HeartbeatResponse.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/HeartbeatResponse.java
index 2920b92..4ea1104 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/HeartbeatResponse.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/HeartbeatResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +21,10 @@
*/
package com.farsunset.cim.sdk.android.model;
-import java.io.Serializable;
-
import com.farsunset.cim.sdk.android.constant.CIMConstant;
+import java.io.Serializable;
+
/**
* 客户端心跳响应
*/
@@ -49,6 +49,7 @@ public class HeartbeatResponse implements Serializable, Protobufable {
return CMD_HEARTBEAT_RESPONSE.getBytes();
}
+ @Override
public String toString() {
return TAG;
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/Message.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Message.java
similarity index 99%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/Message.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Message.java
index fcbca5f..f43d20a 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/Message.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Message.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -137,6 +137,7 @@ public class Message implements Serializable {
this.extra = extra;
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer();
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/Protobufable.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Protobufable.java
similarity index 99%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/Protobufable.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Protobufable.java
index 9970e4b..69f4bec 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/Protobufable.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/Protobufable.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/ReplyBody.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/ReplyBody.java
similarity index 93%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/ReplyBody.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/ReplyBody.java
index d8838b8..ff835b2 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/ReplyBody.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/ReplyBody.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -108,6 +108,7 @@ public class ReplyBody implements Serializable {
this.code = code;
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer();
buffer.append("#ReplyBody#").append("\n");
@@ -115,13 +116,11 @@ public class ReplyBody implements Serializable {
buffer.append("timestamp:").append(timestamp).append("\n");
buffer.append("code:").append(code).append("\n");
- if (!data.isEmpty()) {
- buffer.append("data{").append("\n");
- for (String key : getKeySet()) {
- buffer.append(key).append(":").append(this.get(key)).append("\n");
- }
- buffer.append("}");
+ buffer.append("data{").append("\n");
+ for (String key : getKeySet()) {
+ buffer.append(key).append(":").append(this.get(key)).append("\n");
}
+ buffer.append("}");
return buffer.toString();
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/SentBody.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/SentBody.java
similarity index 91%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/SentBody.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/SentBody.java
index 2b4a581..231861c 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/SentBody.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/SentBody.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,13 +21,13 @@
*/
package com.farsunset.cim.sdk.android.model;
+import com.farsunset.cim.sdk.android.constant.CIMConstant;
+import com.farsunset.cim.sdk.android.model.proto.SentBodyProto;
+
import java.io.Serializable;
import java.util.Hashtable;
import java.util.Set;
-import com.farsunset.cim.sdk.android.constant.CIMConstant;
-import com.farsunset.cim.sdk.android.model.proto.SentBodyProto;
-
/**
* java |android 客户端请求结构
*
@@ -85,16 +85,13 @@ public class SentBody implements Serializable, Protobufable {
public String toString() {
StringBuffer buffer = new StringBuffer();
buffer.append("#SentBody#").append("\n");
- ;
buffer.append("key:").append(key).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n");
- if (!data.isEmpty()) {
- buffer.append("data{").append("\n");
- for (String key : getKeySet()) {
- buffer.append(key).append(":").append(this.get(key)).append("\n");
- }
- buffer.append("}");
+ buffer.append("data{").append("\n");
+ for (String key : getKeySet()) {
+ buffer.append(key).append(":").append(this.get(key)).append("\n");
}
+ buffer.append("}");
return buffer.toString();
}
@@ -111,7 +108,7 @@ public class SentBody implements Serializable, Protobufable {
@Override
public byte getType() {
- return CIMConstant.ProtobufType.SENTBODY;
+ return CIMConstant.ProtobufType.SENT_BODY;
}
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/Message.proto b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/Message.proto
similarity index 100%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/Message.proto
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/Message.proto
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/MessageProto.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/MessageProto.java
similarity index 88%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/MessageProto.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/MessageProto.java
index 885f8de..5f2195e 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/MessageProto.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/MessageProto.java
@@ -20,7 +20,7 @@ public final class MessageProto {
/**
* optional string action = 2;
*/
- java.lang.String getAction();
+ String getAction();
/**
* optional string action = 2;
*/
@@ -30,7 +30,7 @@ public final class MessageProto {
/**
* optional string content = 3;
*/
- java.lang.String getContent();
+ String getContent();
/**
* optional string content = 3;
*/
@@ -40,7 +40,7 @@ public final class MessageProto {
/**
* optional string sender = 4;
*/
- java.lang.String getSender();
+ String getSender();
/**
* optional string sender = 4;
*/
@@ -50,7 +50,7 @@ public final class MessageProto {
/**
* optional string receiver = 5;
*/
- java.lang.String getReceiver();
+ String getReceiver();
/**
* optional string receiver = 5;
*/
@@ -60,7 +60,7 @@ public final class MessageProto {
/**
* optional string extra = 6;
*/
- java.lang.String getExtra();
+ String getExtra();
/**
* optional string extra = 6;
*/
@@ -70,7 +70,7 @@ public final class MessageProto {
/**
* optional string title = 7;
*/
- java.lang.String getTitle();
+ String getTitle();
/**
* optional string title = 7;
*/
@@ -80,7 +80,7 @@ public final class MessageProto {
/**
* optional string format = 8;
*/
- java.lang.String getFormat();
+ String getFormat();
/**
* optional string format = 8;
*/
@@ -133,11 +133,11 @@ public final class MessageProto {
}
public static final int ACTION_FIELD_NUMBER = 2;
- private java.lang.String action_;
+ private String action_;
/**
* optional string action = 2;
*/
- public java.lang.String getAction() {
+ public String getAction() {
return action_;
}
/**
@@ -151,7 +151,7 @@ public final class MessageProto {
* optional string action = 2;
*/
private void setAction(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -179,11 +179,11 @@ public final class MessageProto {
}
public static final int CONTENT_FIELD_NUMBER = 3;
- private java.lang.String content_;
+ private String content_;
/**
* optional string content = 3;
*/
- public java.lang.String getContent() {
+ public String getContent() {
return content_;
}
/**
@@ -197,7 +197,7 @@ public final class MessageProto {
* optional string content = 3;
*/
private void setContent(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -225,11 +225,11 @@ public final class MessageProto {
}
public static final int SENDER_FIELD_NUMBER = 4;
- private java.lang.String sender_;
+ private String sender_;
/**
* optional string sender = 4;
*/
- public java.lang.String getSender() {
+ public String getSender() {
return sender_;
}
/**
@@ -243,7 +243,7 @@ public final class MessageProto {
* optional string sender = 4;
*/
private void setSender(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -271,11 +271,11 @@ public final class MessageProto {
}
public static final int RECEIVER_FIELD_NUMBER = 5;
- private java.lang.String receiver_;
+ private String receiver_;
/**
* optional string receiver = 5;
*/
- public java.lang.String getReceiver() {
+ public String getReceiver() {
return receiver_;
}
/**
@@ -289,7 +289,7 @@ public final class MessageProto {
* optional string receiver = 5;
*/
private void setReceiver(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -317,11 +317,11 @@ public final class MessageProto {
}
public static final int EXTRA_FIELD_NUMBER = 6;
- private java.lang.String extra_;
+ private String extra_;
/**
* optional string extra = 6;
*/
- public java.lang.String getExtra() {
+ public String getExtra() {
return extra_;
}
/**
@@ -335,7 +335,7 @@ public final class MessageProto {
* optional string extra = 6;
*/
private void setExtra(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -363,11 +363,11 @@ public final class MessageProto {
}
public static final int TITLE_FIELD_NUMBER = 7;
- private java.lang.String title_;
+ private String title_;
/**
* optional string title = 7;
*/
- public java.lang.String getTitle() {
+ public String getTitle() {
return title_;
}
/**
@@ -381,7 +381,7 @@ public final class MessageProto {
* optional string title = 7;
*/
private void setTitle(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -409,11 +409,11 @@ public final class MessageProto {
}
public static final int FORMAT_FIELD_NUMBER = 8;
- private java.lang.String format_;
+ private String format_;
/**
* optional string format = 8;
*/
- public java.lang.String getFormat() {
+ public String getFormat() {
return format_;
}
/**
@@ -427,7 +427,7 @@ public final class MessageProto {
* optional string format = 8;
*/
private void setFormat(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -553,60 +553,60 @@ public final class MessageProto {
return size;
}
- public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data);
}
- public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom(byte[] data)
+ public static Model parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data);
}
- public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom(java.io.InputStream input)
+ public static Model parseFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, input);
}
- public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, input, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseDelimitedFrom(java.io.InputStream input)
+ public static Model parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return parseDelimitedFrom(DEFAULT_INSTANCE, input);
}
- public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseDelimitedFrom(
+ public static Model parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return parseDelimitedFrom(DEFAULT_INSTANCE, input, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, input);
}
- public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -617,7 +617,7 @@ public final class MessageProto {
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
}
- public static Builder newBuilder(com.farsunset.cim.sdk.android.model.proto.MessageProto.Model prototype) {
+ public static Builder newBuilder(Model prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
@@ -626,9 +626,9 @@ public final class MessageProto {
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessageLite.Builder<
- com.farsunset.cim.sdk.android.model.proto.MessageProto.Model, Builder> implements
+ Model, Builder> implements
// @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.android.model.proto.Model)
- com.farsunset.cim.sdk.android.model.proto.MessageProto.ModelOrBuilder {
+ ModelOrBuilder {
// Construct using com.farsunset.cim.sdk.android.model.proto.MessageProto.Model.newBuilder()
private Builder() {
super(DEFAULT_INSTANCE);
@@ -661,7 +661,7 @@ public final class MessageProto {
/**
* optional string action = 2;
*/
- public java.lang.String getAction() {
+ public String getAction() {
return instance.getAction();
}
/**
@@ -675,7 +675,7 @@ public final class MessageProto {
* optional string action = 2;
*/
public Builder setAction(
- java.lang.String value) {
+ String value) {
copyOnWrite();
instance.setAction(value);
return this;
@@ -701,7 +701,7 @@ public final class MessageProto {
/**
* optional string content = 3;
*/
- public java.lang.String getContent() {
+ public String getContent() {
return instance.getContent();
}
/**
@@ -715,7 +715,7 @@ public final class MessageProto {
* optional string content = 3;
*/
public Builder setContent(
- java.lang.String value) {
+ String value) {
copyOnWrite();
instance.setContent(value);
return this;
@@ -741,7 +741,7 @@ public final class MessageProto {
/**
* optional string sender = 4;
*/
- public java.lang.String getSender() {
+ public String getSender() {
return instance.getSender();
}
/**
@@ -755,7 +755,7 @@ public final class MessageProto {
* optional string sender = 4;
*/
public Builder setSender(
- java.lang.String value) {
+ String value) {
copyOnWrite();
instance.setSender(value);
return this;
@@ -781,7 +781,7 @@ public final class MessageProto {
/**
* optional string receiver = 5;
*/
- public java.lang.String getReceiver() {
+ public String getReceiver() {
return instance.getReceiver();
}
/**
@@ -795,7 +795,7 @@ public final class MessageProto {
* optional string receiver = 5;
*/
public Builder setReceiver(
- java.lang.String value) {
+ String value) {
copyOnWrite();
instance.setReceiver(value);
return this;
@@ -821,7 +821,7 @@ public final class MessageProto {
/**
* optional string extra = 6;
*/
- public java.lang.String getExtra() {
+ public String getExtra() {
return instance.getExtra();
}
/**
@@ -835,7 +835,7 @@ public final class MessageProto {
* optional string extra = 6;
*/
public Builder setExtra(
- java.lang.String value) {
+ String value) {
copyOnWrite();
instance.setExtra(value);
return this;
@@ -861,7 +861,7 @@ public final class MessageProto {
/**
* optional string title = 7;
*/
- public java.lang.String getTitle() {
+ public String getTitle() {
return instance.getTitle();
}
/**
@@ -875,7 +875,7 @@ public final class MessageProto {
* optional string title = 7;
*/
public Builder setTitle(
- java.lang.String value) {
+ String value) {
copyOnWrite();
instance.setTitle(value);
return this;
@@ -901,7 +901,7 @@ public final class MessageProto {
/**
* optional string format = 8;
*/
- public java.lang.String getFormat() {
+ public String getFormat() {
return instance.getFormat();
}
/**
@@ -915,7 +915,7 @@ public final class MessageProto {
* optional string format = 8;
*/
public Builder setFormat(
- java.lang.String value) {
+ String value) {
copyOnWrite();
instance.setFormat(value);
return this;
@@ -964,11 +964,11 @@ public final class MessageProto {
// @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.android.model.proto.Model)
}
protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
+ MethodToInvoke method,
Object arg0, Object arg1) {
switch (method) {
case NEW_MUTABLE_INSTANCE: {
- return new com.farsunset.cim.sdk.android.model.proto.MessageProto.Model();
+ return new Model();
}
case IS_INITIALIZED: {
return DEFAULT_INSTANCE;
@@ -981,7 +981,7 @@ public final class MessageProto {
}
case VISIT: {
Visitor visitor = (Visitor) arg0;
- com.farsunset.cim.sdk.android.model.proto.MessageProto.Model other = (com.farsunset.cim.sdk.android.model.proto.MessageProto.Model) arg1;
+ Model other = (Model) arg1;
id_ = visitor.visitLong(id_ != 0L, id_,
other.id_ != 0L, other.id_);
action_ = visitor.visitString(!action_.isEmpty(), action_,
@@ -1000,7 +1000,7 @@ public final class MessageProto {
!other.format_.isEmpty(), other.format_);
timestamp_ = visitor.visitLong(timestamp_ != 0L, timestamp_,
other.timestamp_ != 0L, other.timestamp_);
- if (visitor == com.google.protobuf.GeneratedMessageLite.MergeFromVisitor
+ if (visitor == MergeFromVisitor
.INSTANCE) {
}
return this;
@@ -1091,7 +1091,7 @@ public final class MessageProto {
return DEFAULT_INSTANCE;
}
case GET_PARSER: {
- if (PARSER == null) { synchronized (com.farsunset.cim.sdk.android.model.proto.MessageProto.Model.class) {
+ if (PARSER == null) { synchronized (Model.class) {
if (PARSER == null) {
PARSER = new DefaultInstanceBasedParser(DEFAULT_INSTANCE);
}
@@ -1105,13 +1105,13 @@ public final class MessageProto {
// @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.android.model.proto.Model)
- private static final com.farsunset.cim.sdk.android.model.proto.MessageProto.Model DEFAULT_INSTANCE;
+ private static final Model DEFAULT_INSTANCE;
static {
DEFAULT_INSTANCE = new Model();
DEFAULT_INSTANCE.makeImmutable();
}
- public static com.farsunset.cim.sdk.android.model.proto.MessageProto.Model getDefaultInstance() {
+ public static Model getDefaultInstance() {
return DEFAULT_INSTANCE;
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/ReplyBody.proto b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/ReplyBody.proto
similarity index 100%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/ReplyBody.proto
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/ReplyBody.proto
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java
similarity index 78%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java
index 36a429a..f06c473 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/ReplyBodyProto.java
@@ -15,7 +15,7 @@ public final class ReplyBodyProto {
/**
* optional string key = 1;
*/
- java.lang.String getKey();
+ String getKey();
/**
* optional string key = 1;
*/
@@ -25,7 +25,7 @@ public final class ReplyBodyProto {
/**
* optional string code = 2;
*/
- java.lang.String getCode();
+ String getCode();
/**
* optional string code = 2;
*/
@@ -35,7 +35,7 @@ public final class ReplyBodyProto {
/**
* optional string message = 3;
*/
- java.lang.String getMessage();
+ String getMessage();
/**
* optional string message = 3;
*/
@@ -55,31 +55,31 @@ public final class ReplyBodyProto {
* map<string, string> data = 5;
*/
boolean containsData(
- java.lang.String key);
+ String key);
/**
* Use {@link #getDataMap()} instead.
*/
- @java.lang.Deprecated
- java.util.Map
+ @Deprecated
+ java.util.Map
getData();
/**
* map<string, string> data = 5;
*/
- java.util.Map
+ java.util.Map
getDataMap();
/**
* map<string, string> data = 5;
*/
- java.lang.String getDataOrDefault(
- java.lang.String key,
- java.lang.String defaultValue);
+ String getDataOrDefault(
+ String key,
+ String defaultValue);
/**
* map<string, string> data = 5;
*/
- java.lang.String getDataOrThrow(
- java.lang.String key);
+ String getDataOrThrow(
+ String key);
}
/**
* Protobuf type {@code com.farsunset.cim.sdk.android.model.proto.Model}
@@ -96,11 +96,11 @@ public final class ReplyBodyProto {
}
private int bitField0_;
public static final int KEY_FIELD_NUMBER = 1;
- private java.lang.String key_;
+ private String key_;
/**
* optional string key = 1;
*/
- public java.lang.String getKey() {
+ public String getKey() {
return key_;
}
/**
@@ -114,7 +114,7 @@ public final class ReplyBodyProto {
* optional string key = 1;
*/
private void setKey(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -142,11 +142,11 @@ public final class ReplyBodyProto {
}
public static final int CODE_FIELD_NUMBER = 2;
- private java.lang.String code_;
+ private String code_;
/**
* optional string code = 2;
*/
- public java.lang.String getCode() {
+ public String getCode() {
return code_;
}
/**
@@ -160,7 +160,7 @@ public final class ReplyBodyProto {
* optional string code = 2;
*/
private void setCode(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -188,11 +188,11 @@ public final class ReplyBodyProto {
}
public static final int MESSAGE_FIELD_NUMBER = 3;
- private java.lang.String message_;
+ private String message_;
/**
* optional string message = 3;
*/
- public java.lang.String getMessage() {
+ public String getMessage() {
return message_;
}
/**
@@ -206,7 +206,7 @@ public final class ReplyBodyProto {
* optional string message = 3;
*/
private void setMessage(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -259,22 +259,22 @@ public final class ReplyBodyProto {
public static final int DATA_FIELD_NUMBER = 5;
private static final class DataDefaultEntryHolder {
static final com.google.protobuf.MapEntryLite<
- java.lang.String, java.lang.String> defaultEntry =
+ String, String> defaultEntry =
com.google.protobuf.MapEntryLite
- .newDefaultInstance(
+ .newDefaultInstance(
com.google.protobuf.WireFormat.FieldType.STRING,
"",
com.google.protobuf.WireFormat.FieldType.STRING,
"");
}
private com.google.protobuf.MapFieldLite<
- java.lang.String, java.lang.String> data_ =
+ String, String> data_ =
com.google.protobuf.MapFieldLite.emptyMapField();
- private com.google.protobuf.MapFieldLite
+ private com.google.protobuf.MapFieldLite
internalGetData() {
return data_;
}
- private com.google.protobuf.MapFieldLite
+ private com.google.protobuf.MapFieldLite
internalGetMutableData() {
if (!data_.isMutable()) {
data_ = data_.mutableCopy();
@@ -290,22 +290,22 @@ public final class ReplyBodyProto {
*/
public boolean containsData(
- java.lang.String key) {
- if (key == null) { throw new java.lang.NullPointerException(); }
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
return internalGetData().containsKey(key);
}
/**
* Use {@link #getDataMap()} instead.
*/
- @java.lang.Deprecated
- public java.util.Map getData() {
+ @Deprecated
+ public java.util.Map getData() {
return getDataMap();
}
/**
* map<string, string> data = 5;
*/
- public java.util.Map getDataMap() {
+ public java.util.Map getDataMap() {
return java.util.Collections.unmodifiableMap(
internalGetData());
}
@@ -313,11 +313,11 @@ public final class ReplyBodyProto {
* map<string, string> data = 5;
*/
- public java.lang.String getDataOrDefault(
- java.lang.String key,
- java.lang.String defaultValue) {
- if (key == null) { throw new java.lang.NullPointerException(); }
- java.util.Map map =
+ public String getDataOrDefault(
+ String key,
+ String defaultValue) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
internalGetData();
return map.containsKey(key) ? map.get(key) : defaultValue;
}
@@ -325,20 +325,20 @@ public final class ReplyBodyProto {
* map<string, string> data = 5;
*/
- public java.lang.String getDataOrThrow(
- java.lang.String key) {
- if (key == null) { throw new java.lang.NullPointerException(); }
- java.util.Map map =
+ public String getDataOrThrow(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
internalGetData();
if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
+ throw new IllegalArgumentException();
}
return map.get(key);
}
/**
* map<string, string> data = 5;
*/
- private java.util.Map
+ private java.util.Map
getMutableDataMap() {
return internalGetMutableData();
}
@@ -357,7 +357,7 @@ public final class ReplyBodyProto {
if (timestamp_ != 0L) {
output.writeInt64(4, timestamp_);
}
- for (java.util.Map.Entry entry
+ for (java.util.Map.Entry entry
: internalGetData().entrySet()) {
DataDefaultEntryHolder.defaultEntry.serializeTo(
output, 5, entry.getKey(), entry.getValue());
@@ -385,7 +385,7 @@ public final class ReplyBodyProto {
size += com.google.protobuf.CodedOutputStream
.computeInt64Size(4, timestamp_);
}
- for (java.util.Map.Entry entry
+ for (java.util.Map.Entry entry
: internalGetData().entrySet()) {
size += DataDefaultEntryHolder.defaultEntry.computeMessageSize(
5, entry.getKey(), entry.getValue());
@@ -394,60 +394,60 @@ public final class ReplyBodyProto {
return size;
}
- public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data);
}
- public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom(byte[] data)
+ public static Model parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data);
}
- public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom(
+ public static Model parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom(java.io.InputStream input)
+ public static Model parseFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, input);
}
- public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom(
+ public static Model parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, input, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseDelimitedFrom(java.io.InputStream input)
+ public static Model parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return parseDelimitedFrom(DEFAULT_INSTANCE, input);
}
- public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseDelimitedFrom(
+ public static Model parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return parseDelimitedFrom(DEFAULT_INSTANCE, input, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, input);
}
- public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -458,7 +458,7 @@ public final class ReplyBodyProto {
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
}
- public static Builder newBuilder(com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model prototype) {
+ public static Builder newBuilder(Model prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
@@ -467,9 +467,9 @@ public final class ReplyBodyProto {
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessageLite.Builder<
- com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model, Builder> implements
+ Model, Builder> implements
// @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.android.model.proto.Model)
- com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.ModelOrBuilder {
+ ModelOrBuilder {
// Construct using com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model.newBuilder()
private Builder() {
super(DEFAULT_INSTANCE);
@@ -479,7 +479,7 @@ public final class ReplyBodyProto {
/**
* optional string key = 1;
*/
- public java.lang.String getKey() {
+ public String getKey() {
return instance.getKey();
}
/**
@@ -493,7 +493,7 @@ public final class ReplyBodyProto {
* optional string key = 1;
*/
public Builder setKey(
- java.lang.String value) {
+ String value) {
copyOnWrite();
instance.setKey(value);
return this;
@@ -519,7 +519,7 @@ public final class ReplyBodyProto {
/**
* optional string code = 2;
*/
- public java.lang.String getCode() {
+ public String getCode() {
return instance.getCode();
}
/**
@@ -533,7 +533,7 @@ public final class ReplyBodyProto {
* optional string code = 2;
*/
public Builder setCode(
- java.lang.String value) {
+ String value) {
copyOnWrite();
instance.setCode(value);
return this;
@@ -559,7 +559,7 @@ public final class ReplyBodyProto {
/**
* optional string message = 3;
*/
- public java.lang.String getMessage() {
+ public String getMessage() {
return instance.getMessage();
}
/**
@@ -573,7 +573,7 @@ public final class ReplyBodyProto {
* optional string message = 3;
*/
public Builder setMessage(
- java.lang.String value) {
+ String value) {
copyOnWrite();
instance.setMessage(value);
return this;
@@ -628,8 +628,8 @@ public final class ReplyBodyProto {
*/
public boolean containsData(
- java.lang.String key) {
- if (key == null) { throw new java.lang.NullPointerException(); }
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
return instance.getDataMap().containsKey(key);
}
@@ -643,8 +643,8 @@ public final class ReplyBodyProto {
*/
public Builder removeData(
- java.lang.String key) {
- if (key == null) { throw new java.lang.NullPointerException(); }
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
copyOnWrite();
instance.getMutableDataMap().remove(key);
return this;
@@ -652,14 +652,14 @@ public final class ReplyBodyProto {
/**
* Use {@link #getDataMap()} instead.
*/
- @java.lang.Deprecated
- public java.util.Map getData() {
+ @Deprecated
+ public java.util.Map getData() {
return getDataMap();
}
/**
* map<string, string> data = 5;
*/
- public java.util.Map getDataMap() {
+ public java.util.Map getDataMap() {
return java.util.Collections.unmodifiableMap(
instance.getDataMap());
}
@@ -667,11 +667,11 @@ public final class ReplyBodyProto {
* map<string, string> data = 5;
*/
- public java.lang.String getDataOrDefault(
- java.lang.String key,
- java.lang.String defaultValue) {
- if (key == null) { throw new java.lang.NullPointerException(); }
- java.util.Map map =
+ public String getDataOrDefault(
+ String key,
+ String defaultValue) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
instance.getDataMap();
return map.containsKey(key) ? map.get(key) : defaultValue;
}
@@ -679,13 +679,13 @@ public final class ReplyBodyProto {
* map<string, string> data = 5;
*/
- public java.lang.String getDataOrThrow(
- java.lang.String key) {
- if (key == null) { throw new java.lang.NullPointerException(); }
- java.util.Map map =
+ public String getDataOrThrow(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
instance.getDataMap();
if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
+ throw new IllegalArgumentException();
}
return map.get(key);
}
@@ -693,10 +693,10 @@ public final class ReplyBodyProto {
* map<string, string> data = 5;
*/
public Builder putData(
- java.lang.String key,
- java.lang.String value) {
- if (key == null) { throw new java.lang.NullPointerException(); }
- if (value == null) { throw new java.lang.NullPointerException(); }
+ String key,
+ String value) {
+ if (key == null) { throw new NullPointerException(); }
+ if (value == null) { throw new NullPointerException(); }
copyOnWrite();
instance.getMutableDataMap().put(key, value);
return this;
@@ -705,7 +705,7 @@ public final class ReplyBodyProto {
* map<string, string> data = 5;
*/
public Builder putAllData(
- java.util.Map values) {
+ java.util.Map values) {
copyOnWrite();
instance.getMutableDataMap().putAll(values);
return this;
@@ -714,11 +714,11 @@ public final class ReplyBodyProto {
// @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.android.model.proto.Model)
}
protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
+ MethodToInvoke method,
Object arg0, Object arg1) {
switch (method) {
case NEW_MUTABLE_INSTANCE: {
- return new com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model();
+ return new Model();
}
case IS_INITIALIZED: {
return DEFAULT_INSTANCE;
@@ -732,7 +732,7 @@ public final class ReplyBodyProto {
}
case VISIT: {
Visitor visitor = (Visitor) arg0;
- com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model other = (com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model) arg1;
+ Model other = (Model) arg1;
key_ = visitor.visitString(!key_.isEmpty(), key_,
!other.key_.isEmpty(), other.key_);
code_ = visitor.visitString(!code_.isEmpty(), code_,
@@ -743,7 +743,7 @@ public final class ReplyBodyProto {
other.timestamp_ != 0L, other.timestamp_);
data_ = visitor.visitMap(
data_, other.internalGetData());
- if (visitor == com.google.protobuf.GeneratedMessageLite.MergeFromVisitor
+ if (visitor == MergeFromVisitor
.INSTANCE) {
bitField0_ |= other.bitField0_;
}
@@ -812,7 +812,7 @@ public final class ReplyBodyProto {
return DEFAULT_INSTANCE;
}
case GET_PARSER: {
- if (PARSER == null) { synchronized (com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model.class) {
+ if (PARSER == null) { synchronized (Model.class) {
if (PARSER == null) {
PARSER = new DefaultInstanceBasedParser(DEFAULT_INSTANCE);
}
@@ -826,13 +826,13 @@ public final class ReplyBodyProto {
// @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.android.model.proto.Model)
- private static final com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model DEFAULT_INSTANCE;
+ private static final Model DEFAULT_INSTANCE;
static {
DEFAULT_INSTANCE = new Model();
DEFAULT_INSTANCE.makeImmutable();
}
- public static com.farsunset.cim.sdk.android.model.proto.ReplyBodyProto.Model getDefaultInstance() {
+ public static Model getDefaultInstance() {
return DEFAULT_INSTANCE;
}
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/SentBody.proto b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/SentBody.proto
similarity index 100%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/SentBody.proto
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/SentBody.proto
diff --git a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java
similarity index 75%
rename from cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java
rename to cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java
index 7c36fc7..0745929 100644
--- a/cim-client-sdk/cim-android-sdk/src/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java
+++ b/cim-client-sdk/cim-android-sdk/src/main/java/com/farsunset/cim/sdk/android/model/proto/SentBodyProto.java
@@ -15,7 +15,7 @@ public final class SentBodyProto {
/**
* optional string key = 1;
*/
- java.lang.String getKey();
+ String getKey();
/**
* optional string key = 1;
*/
@@ -35,31 +35,31 @@ public final class SentBodyProto {
* map<string, string> data = 3;
*/
boolean containsData(
- java.lang.String key);
+ String key);
/**
* Use {@link #getDataMap()} instead.
*/
- @java.lang.Deprecated
- java.util.Map
+ @Deprecated
+ java.util.Map
getData();
/**
* map<string, string> data = 3;
*/
- java.util.Map
+ java.util.Map
getDataMap();
/**
* map<string, string> data = 3;
*/
- java.lang.String getDataOrDefault(
- java.lang.String key,
- java.lang.String defaultValue);
+ String getDataOrDefault(
+ String key,
+ String defaultValue);
/**
* map<string, string> data = 3;
*/
- java.lang.String getDataOrThrow(
- java.lang.String key);
+ String getDataOrThrow(
+ String key);
}
/**
* Protobuf type {@code com.farsunset.cim.sdk.android.model.proto.Model}
@@ -74,11 +74,11 @@ public final class SentBodyProto {
}
private int bitField0_;
public static final int KEY_FIELD_NUMBER = 1;
- private java.lang.String key_;
+ private String key_;
/**
* optional string key = 1;
*/
- public java.lang.String getKey() {
+ public String getKey() {
return key_;
}
/**
@@ -92,7 +92,7 @@ public final class SentBodyProto {
* optional string key = 1;
*/
private void setKey(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -145,22 +145,22 @@ public final class SentBodyProto {
public static final int DATA_FIELD_NUMBER = 3;
private static final class DataDefaultEntryHolder {
static final com.google.protobuf.MapEntryLite<
- java.lang.String, java.lang.String> defaultEntry =
+ String, String> defaultEntry =
com.google.protobuf.MapEntryLite
- .newDefaultInstance(
+ .newDefaultInstance(
com.google.protobuf.WireFormat.FieldType.STRING,
"",
com.google.protobuf.WireFormat.FieldType.STRING,
"");
}
private com.google.protobuf.MapFieldLite<
- java.lang.String, java.lang.String> data_ =
+ String, String> data_ =
com.google.protobuf.MapFieldLite.emptyMapField();
- private com.google.protobuf.MapFieldLite
+ private com.google.protobuf.MapFieldLite
internalGetData() {
return data_;
}
- private com.google.protobuf.MapFieldLite
+ private com.google.protobuf.MapFieldLite
internalGetMutableData() {
if (!data_.isMutable()) {
data_ = data_.mutableCopy();
@@ -176,22 +176,22 @@ public final class SentBodyProto {
*/
public boolean containsData(
- java.lang.String key) {
- if (key == null) { throw new java.lang.NullPointerException(); }
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
return internalGetData().containsKey(key);
}
/**
* Use {@link #getDataMap()} instead.
*/
- @java.lang.Deprecated
- public java.util.Map getData() {
+ @Deprecated
+ public java.util.Map getData() {
return getDataMap();
}
/**
* map<string, string> data = 3;
*/
- public java.util.Map getDataMap() {
+ public java.util.Map getDataMap() {
return java.util.Collections.unmodifiableMap(
internalGetData());
}
@@ -199,11 +199,11 @@ public final class SentBodyProto {
* map<string, string> data = 3;
*/
- public java.lang.String getDataOrDefault(
- java.lang.String key,
- java.lang.String defaultValue) {
- if (key == null) { throw new java.lang.NullPointerException(); }
- java.util.Map map =
+ public String getDataOrDefault(
+ String key,
+ String defaultValue) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
internalGetData();
return map.containsKey(key) ? map.get(key) : defaultValue;
}
@@ -211,20 +211,20 @@ public final class SentBodyProto {
* map<string, string> data = 3;
*/
- public java.lang.String getDataOrThrow(
- java.lang.String key) {
- if (key == null) { throw new java.lang.NullPointerException(); }
- java.util.Map map =
+ public String getDataOrThrow(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
internalGetData();
if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
+ throw new IllegalArgumentException();
}
return map.get(key);
}
/**
* map<string, string> data = 3;
*/
- private java.util.Map
+ private java.util.Map
getMutableDataMap() {
return internalGetMutableData();
}
@@ -237,7 +237,7 @@ public final class SentBodyProto {
if (timestamp_ != 0L) {
output.writeInt64(2, timestamp_);
}
- for (java.util.Map.Entry entry
+ for (java.util.Map.Entry entry
: internalGetData().entrySet()) {
DataDefaultEntryHolder.defaultEntry.serializeTo(
output, 3, entry.getKey(), entry.getValue());
@@ -257,7 +257,7 @@ public final class SentBodyProto {
size += com.google.protobuf.CodedOutputStream
.computeInt64Size(2, timestamp_);
}
- for (java.util.Map.Entry entry
+ for (java.util.Map.Entry entry
: internalGetData().entrySet()) {
size += DataDefaultEntryHolder.defaultEntry.computeMessageSize(
3, entry.getKey(), entry.getValue());
@@ -266,60 +266,60 @@ public final class SentBodyProto {
return size;
}
- public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data);
}
- public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom(byte[] data)
+ public static Model parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data);
}
- public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom(
+ public static Model parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom(java.io.InputStream input)
+ public static Model parseFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, input);
}
- public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom(
+ public static Model parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, input, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseDelimitedFrom(java.io.InputStream input)
+ public static Model parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return parseDelimitedFrom(DEFAULT_INSTANCE, input);
}
- public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseDelimitedFrom(
+ public static Model parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return parseDelimitedFrom(DEFAULT_INSTANCE, input, extensionRegistry);
}
- public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageLite.parseFrom(
DEFAULT_INSTANCE, input);
}
- public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -330,7 +330,7 @@ public final class SentBodyProto {
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
}
- public static Builder newBuilder(com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model prototype) {
+ public static Builder newBuilder(Model prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
@@ -339,9 +339,9 @@ public final class SentBodyProto {
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessageLite.Builder<
- com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model, Builder> implements
+ Model, Builder> implements
// @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.android.model.proto.Model)
- com.farsunset.cim.sdk.android.model.proto.SentBodyProto.ModelOrBuilder {
+ ModelOrBuilder {
// Construct using com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model.newBuilder()
private Builder() {
super(DEFAULT_INSTANCE);
@@ -351,7 +351,7 @@ public final class SentBodyProto {
/**
* optional string key = 1;
*/
- public java.lang.String getKey() {
+ public String getKey() {
return instance.getKey();
}
/**
@@ -365,7 +365,7 @@ public final class SentBodyProto {
* optional string key = 1;
*/
public Builder setKey(
- java.lang.String value) {
+ String value) {
copyOnWrite();
instance.setKey(value);
return this;
@@ -420,8 +420,8 @@ public final class SentBodyProto {
*/
public boolean containsData(
- java.lang.String key) {
- if (key == null) { throw new java.lang.NullPointerException(); }
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
return instance.getDataMap().containsKey(key);
}
@@ -435,8 +435,8 @@ public final class SentBodyProto {
*/
public Builder removeData(
- java.lang.String key) {
- if (key == null) { throw new java.lang.NullPointerException(); }
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
copyOnWrite();
instance.getMutableDataMap().remove(key);
return this;
@@ -444,14 +444,14 @@ public final class SentBodyProto {
/**
* Use {@link #getDataMap()} instead.
*/
- @java.lang.Deprecated
- public java.util.Map getData() {
+ @Deprecated
+ public java.util.Map getData() {
return getDataMap();
}
/**
* map<string, string> data = 3;
*/
- public java.util.Map getDataMap() {
+ public java.util.Map getDataMap() {
return java.util.Collections.unmodifiableMap(
instance.getDataMap());
}
@@ -459,11 +459,11 @@ public final class SentBodyProto {
* map<string, string> data = 3;
*/
- public java.lang.String getDataOrDefault(
- java.lang.String key,
- java.lang.String defaultValue) {
- if (key == null) { throw new java.lang.NullPointerException(); }
- java.util.Map map =
+ public String getDataOrDefault(
+ String key,
+ String defaultValue) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
instance.getDataMap();
return map.containsKey(key) ? map.get(key) : defaultValue;
}
@@ -471,13 +471,13 @@ public final class SentBodyProto {
* map<string, string> data = 3;
*/
- public java.lang.String getDataOrThrow(
- java.lang.String key) {
- if (key == null) { throw new java.lang.NullPointerException(); }
- java.util.Map map =
+ public String getDataOrThrow(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
instance.getDataMap();
if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
+ throw new IllegalArgumentException();
}
return map.get(key);
}
@@ -485,10 +485,10 @@ public final class SentBodyProto {
* map<string, string> data = 3;
*/
public Builder putData(
- java.lang.String key,
- java.lang.String value) {
- if (key == null) { throw new java.lang.NullPointerException(); }
- if (value == null) { throw new java.lang.NullPointerException(); }
+ String key,
+ String value) {
+ if (key == null) { throw new NullPointerException(); }
+ if (value == null) { throw new NullPointerException(); }
copyOnWrite();
instance.getMutableDataMap().put(key, value);
return this;
@@ -497,7 +497,7 @@ public final class SentBodyProto {
* map<string, string> data = 3;
*/
public Builder putAllData(
- java.util.Map values) {
+ java.util.Map values) {
copyOnWrite();
instance.getMutableDataMap().putAll(values);
return this;
@@ -506,11 +506,11 @@ public final class SentBodyProto {
// @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.android.model.proto.Model)
}
protected final Object dynamicMethod(
- com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,
+ MethodToInvoke method,
Object arg0, Object arg1) {
switch (method) {
case NEW_MUTABLE_INSTANCE: {
- return new com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model();
+ return new Model();
}
case IS_INITIALIZED: {
return DEFAULT_INSTANCE;
@@ -524,14 +524,14 @@ public final class SentBodyProto {
}
case VISIT: {
Visitor visitor = (Visitor) arg0;
- com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model other = (com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model) arg1;
+ Model other = (Model) arg1;
key_ = visitor.visitString(!key_.isEmpty(), key_,
!other.key_.isEmpty(), other.key_);
timestamp_ = visitor.visitLong(timestamp_ != 0L, timestamp_,
other.timestamp_ != 0L, other.timestamp_);
data_ = visitor.visitMap(
data_, other.internalGetData());
- if (visitor == com.google.protobuf.GeneratedMessageLite.MergeFromVisitor
+ if (visitor == MergeFromVisitor
.INSTANCE) {
bitField0_ |= other.bitField0_;
}
@@ -588,7 +588,7 @@ public final class SentBodyProto {
return DEFAULT_INSTANCE;
}
case GET_PARSER: {
- if (PARSER == null) { synchronized (com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model.class) {
+ if (PARSER == null) { synchronized (Model.class) {
if (PARSER == null) {
PARSER = new DefaultInstanceBasedParser(DEFAULT_INSTANCE);
}
@@ -602,13 +602,13 @@ public final class SentBodyProto {
// @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.android.model.proto.Model)
- private static final com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model DEFAULT_INSTANCE;
+ private static final Model DEFAULT_INSTANCE;
static {
DEFAULT_INSTANCE = new Model();
DEFAULT_INSTANCE.makeImmutable();
}
- public static com.farsunset.cim.sdk.android.model.proto.SentBodyProto.Model getDefaultInstance() {
+ public static Model getDefaultInstance() {
return DEFAULT_INSTANCE;
}
diff --git a/cim-client-sdk/cim-java-sdk/.classpath b/cim-client-sdk/cim-java-sdk/.classpath
deleted file mode 100644
index 7867dc7..0000000
--- a/cim-client-sdk/cim-java-sdk/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/cim-client-sdk/cim-java-sdk/.gitignore b/cim-client-sdk/cim-java-sdk/.gitignore
new file mode 100644
index 0000000..07827cc
--- /dev/null
+++ b/cim-client-sdk/cim-java-sdk/.gitignore
@@ -0,0 +1,2 @@
+target/
+.idea/
\ No newline at end of file
diff --git a/cim-client-sdk/cim-java-sdk/.project b/cim-client-sdk/cim-java-sdk/.project
deleted file mode 100644
index f63422e..0000000
--- a/cim-client-sdk/cim-java-sdk/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- cim-java-sdk
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder
-
-
-
-
-
- com.genuitec.eclipse.ast.deploy.core.deploymentnature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/cim-client-sdk/cim-java-sdk/.settings/org.eclipse.core.resources.prefs b/cim-client-sdk/cim-java-sdk/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99b2bf9..0000000
--- a/cim-client-sdk/cim-java-sdk/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Oct 15 09:31:41 CST 2014
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/cim-client-sdk/cim-java-sdk/cim-java-sdk.iml b/cim-client-sdk/cim-java-sdk/cim-java-sdk.iml
new file mode 100644
index 0000000..78b2cc5
--- /dev/null
+++ b/cim-client-sdk/cim-java-sdk/cim-java-sdk.iml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/cim-client-sdk/cim-java-sdk/jar.bat b/cim-client-sdk/cim-java-sdk/jar.bat
new file mode 100644
index 0000000..f0b4c1c
--- /dev/null
+++ b/cim-client-sdk/cim-java-sdk/jar.bat
@@ -0,0 +1 @@
+mvn clean package
\ No newline at end of file
diff --git a/cim-client-sdk/cim-java-sdk/jar.sh b/cim-client-sdk/cim-java-sdk/jar.sh
new file mode 100644
index 0000000..f0b4c1c
--- /dev/null
+++ b/cim-client-sdk/cim-java-sdk/jar.sh
@@ -0,0 +1 @@
+mvn clean package
\ No newline at end of file
diff --git a/cim-client-sdk/cim-java-sdk/libs/protobuf-java-3.7.0.jar b/cim-client-sdk/cim-java-sdk/libs/protobuf-java-3.7.0.jar
deleted file mode 100644
index eebaefe..0000000
Binary files a/cim-client-sdk/cim-java-sdk/libs/protobuf-java-3.7.0.jar and /dev/null differ
diff --git a/cim-client-sdk/cim-java-sdk/libs/slf4j-api-1.7.5.jar b/cim-client-sdk/cim-java-sdk/libs/slf4j-api-1.7.5.jar
deleted file mode 100644
index 8766455..0000000
Binary files a/cim-client-sdk/cim-java-sdk/libs/slf4j-api-1.7.5.jar and /dev/null differ
diff --git a/cim-client-sdk/cim-java-sdk/libs/slf4j-nop-1.7.5.jar b/cim-client-sdk/cim-java-sdk/libs/slf4j-nop-1.7.5.jar
deleted file mode 100644
index e55bdd8..0000000
Binary files a/cim-client-sdk/cim-java-sdk/libs/slf4j-nop-1.7.5.jar and /dev/null differ
diff --git a/cim-client-sdk/cim-java-sdk/pom.xml b/cim-client-sdk/cim-java-sdk/pom.xml
new file mode 100644
index 0000000..870f53c
--- /dev/null
+++ b/cim-client-sdk/cim-java-sdk/pom.xml
@@ -0,0 +1,51 @@
+
+
+ 4.0.0
+
+ com.farsunset
+ cim-java-sdk
+ 3.8.0
+ jar
+
+
+ UTF-8
+ UTF-8
+ 1.8
+ 3.11.1
+ 1.7.30
+
+
+
+
+
+
+ com.google.protobuf
+ protobuf-java
+ ${protobuf.version}
+
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.1
+
+ 8
+ 8
+
+
+
+
+
\ No newline at end of file
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/constant/CIMConstant.java b/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/constant/CIMConstant.java
deleted file mode 100644
index a25b2df..0000000
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/constant/CIMConstant.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.client.constant;
-
-/**
- * 常量
- */
-public interface CIMConstant {
-
- long RECONN_INTERVAL_TIME = 30 * 1000;
- // 消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度
- int DATA_HEADER_LENGTH = 3;
-
- public static interface ReturnCode {
-
- String CODE_404 = "404";
-
- String CODE_403 = "403";
-
- String CODE_405 = "405";
-
- String CODE_200 = "200";
-
- String CODE_206 = "206";
-
- String CODE_500 = "500";
-
- }
-
- public static interface ConfigKey {
-
- public static String DEVICE_MODEL = "client.model";
- public static String CLIENT_VERSION = "client.version";
- public static String CLIENT_ACCOUNT = "client.account";
- public static String CLIENT_DEVICEID = "client.deviceid";
-
- }
-
- public static interface ProtobufType {
- byte C_H_RS = 0;
- byte S_H_RQ = 1;
- byte MESSAGE = 2;
- byte SENTBODY = 3;
- byte REPLYBODY = 4;
- }
-
- public static interface RequestKey {
-
- String CLIENT_BIND = "client_bind";
-
- String CLIENT_LOGOUT = "client_logout";
-
- @Deprecated
- String CLIENT_PULL_MESSAGE = "client_pull_message";
-
- }
-
- public static interface MessageAction {
-
- // 被其他设备登录挤下线消息
- String ACTION_999 = "999";
- // 被系统禁用消息
- String ACTION_444 = "444";
- }
-
- public static interface IntentAction {
-
- // 消息广播action
- String ACTION_MESSAGE_RECEIVED = "com.farsunset.cim.MESSAGE_RECEIVED";
-
- // 发送sendbody成功广播
- String ACTION_SENT_SUCCESSED = "com.farsunset.cim.SENT_SUCCESSED";
-
- // 链接意外关闭广播
- String ACTION_CONNECTION_CLOSED = "com.farsunset.cim.CONNECTION_CLOSED";
-
- // 链接失败广播
- String ACTION_CONNECTION_FAILED = "com.farsunset.cim.CONNECTION_FAILED";
-
- // 链接成功广播
- String ACTION_CONNECTION_SUCCESSED = "com.farsunset.cim.CONNECTION_SUCCESSED";
-
- // 发送sendbody成功后获得replaybody回应广播
- String ACTION_REPLY_RECEIVED = "com.farsunset.cim.REPLY_RECEIVED";
-
- // 网络变化广播
- String ACTION_NETWORK_CHANGED = "android.net.conn.CONNECTIVITY_CHANGE";
-
- // 未知异常
- String ACTION_UNCAUGHT_EXCEPTION = "com.farsunset.cim.UNCAUGHT_EXCEPTION";
-
- // 重试连接
- String ACTION_CONNECTION_RECOVERY = "com.farsunset.cim.CONNECTION_RECOVERY";
- }
-
-}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/exception/SessionClosedException.java b/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/exception/SessionClosedException.java
deleted file mode 100644
index ff4c719..0000000
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/exception/SessionClosedException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.client.exception;
-
-public class SessionClosedException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- public SessionClosedException() {
- super();
- }
-
- public SessionClosedException(String s) {
- super(s);
- }
-}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/ReplyBodyProto.java b/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/ReplyBodyProto.java
deleted file mode 100644
index fb559b6..0000000
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/ReplyBodyProto.java
+++ /dev/null
@@ -1,1200 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.model.proto;
-
-public final class ReplyBodyProto {
- private ReplyBodyProto() {
- }
-
- public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {
- }
-
- public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
- registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
- }
-
- public interface ModelOrBuilder extends
- // @@protoc_insertion_point(interface_extends:com.farsunset.cim.sdk.model.proto.Model)
- com.google.protobuf.MessageOrBuilder {
-
- /**
- * string key = 1;
- */
- java.lang.String getKey();
-
- /**
- * string key = 1;
- */
- com.google.protobuf.ByteString getKeyBytes();
-
- /**
- * string code = 2;
- */
- java.lang.String getCode();
-
- /**
- * string code = 2;
- */
- com.google.protobuf.ByteString getCodeBytes();
-
- /**
- * string message = 3;
- */
- java.lang.String getMessage();
-
- /**
- * string message = 3;
- */
- com.google.protobuf.ByteString getMessageBytes();
-
- /**
- * int64 timestamp = 4;
- */
- long getTimestamp();
-
- /**
- * map<string, string> data = 5;
- */
- int getDataCount();
-
- /**
- * map<string, string> data = 5;
- */
- boolean containsData(java.lang.String key);
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- java.util.Map getData();
-
- /**
- * map<string, string> data = 5;
- */
- java.util.Map getDataMap();
-
- /**
- * map<string, string> data = 5;
- */
-
- java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue);
-
- /**
- * map<string, string> data = 5;
- */
-
- java.lang.String getDataOrThrow(java.lang.String key);
- }
-
- /**
- * Protobuf type {@code com.farsunset.cim.sdk.model.proto.Model}
- */
- public static final class Model extends com.google.protobuf.GeneratedMessageV3 implements
- // @@protoc_insertion_point(message_implements:com.farsunset.cim.sdk.model.proto.Model)
- ModelOrBuilder {
- // Use Model.newBuilder() to construct.
- private Model(com.google.protobuf.GeneratedMessageV3.Builder builder) {
- super(builder);
- }
-
- private Model() {
- key_ = "";
- code_ = "";
- message_ = "";
- timestamp_ = 0L;
- }
-
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
- }
-
- private Model(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- this();
- int mutable_bitField0_ = 0;
- try {
- boolean done = false;
- while (!done) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- done = true;
- break;
- default: {
- if (!input.skipField(tag)) {
- done = true;
- }
- break;
- }
- case 10: {
- java.lang.String s = input.readStringRequireUtf8();
-
- key_ = s;
- break;
- }
- case 18: {
- java.lang.String s = input.readStringRequireUtf8();
-
- code_ = s;
- break;
- }
- case 26: {
- java.lang.String s = input.readStringRequireUtf8();
-
- message_ = s;
- break;
- }
- case 32: {
-
- timestamp_ = input.readInt64();
- break;
- }
- case 42: {
- if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
- data_ = com.google.protobuf.MapField.newMapField(DataDefaultEntryHolder.defaultEntry);
- mutable_bitField0_ |= 0x00000010;
- }
- com.google.protobuf.MapEntry data__ = input
- .readMessage(DataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
- data_.getMutableMap().put(data__.getKey(), data__.getValue());
- break;
- }
- }
- }
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw e.setUnfinishedMessage(this);
- } catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
- } finally {
- makeExtensionsImmutable();
- }
- }
-
- public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return com.farsunset.cim.sdk.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMapField(int number) {
- switch (number) {
- case 5:
- return internalGetData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
- .ensureFieldAccessorsInitialized(com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model.class,
- com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model.Builder.class);
- }
-
- private int bitField0_;
- public static final int KEY_FIELD_NUMBER = 1;
- private volatile java.lang.Object key_;
-
- /**
- * string key = 1;
- */
- public java.lang.String getKey() {
- java.lang.Object ref = key_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- key_ = s;
- return s;
- }
- }
-
- /**
- * string key = 1;
- */
- public com.google.protobuf.ByteString getKeyBytes() {
- java.lang.Object ref = key_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- key_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- public static final int CODE_FIELD_NUMBER = 2;
- private volatile java.lang.Object code_;
-
- /**
- * string code = 2;
- */
- public java.lang.String getCode() {
- java.lang.Object ref = code_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- code_ = s;
- return s;
- }
- }
-
- /**
- * string code = 2;
- */
- public com.google.protobuf.ByteString getCodeBytes() {
- java.lang.Object ref = code_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- code_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- public static final int MESSAGE_FIELD_NUMBER = 3;
- private volatile java.lang.Object message_;
-
- /**
- * string message = 3;
- */
- public java.lang.String getMessage() {
- java.lang.Object ref = message_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- message_ = s;
- return s;
- }
- }
-
- /**
- * string message = 3;
- */
- public com.google.protobuf.ByteString getMessageBytes() {
- java.lang.Object ref = message_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- message_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- public static final int TIMESTAMP_FIELD_NUMBER = 4;
- private long timestamp_;
-
- /**
- * int64 timestamp = 4;
- */
- public long getTimestamp() {
- return timestamp_;
- }
-
- public static final int DATA_FIELD_NUMBER = 5;
-
- private static final class DataDefaultEntryHolder {
- static final com.google.protobuf.MapEntry defaultEntry = com.google.protobuf.MapEntry.newDefaultInstance(
- com.farsunset.cim.sdk.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor,
- com.google.protobuf.WireFormat.FieldType.STRING, "",
- com.google.protobuf.WireFormat.FieldType.STRING, "");
- }
-
- private com.google.protobuf.MapField data_;
-
- private com.google.protobuf.MapField internalGetData() {
- if (data_ == null) {
- return com.google.protobuf.MapField.emptyMapField(DataDefaultEntryHolder.defaultEntry);
- }
- return data_;
- }
-
- public int getDataCount() {
- return internalGetData().getMap().size();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public boolean containsData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- return internalGetData().getMap().containsKey(key);
- }
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- public java.util.Map getData() {
- return getDataMap();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.util.Map getDataMap() {
- return internalGetData().getMap();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- return map.containsKey(key) ? map.get(key) : defaultValue;
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.lang.String getDataOrThrow(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
- }
- return map.get(key);
- }
-
- private byte memoizedIsInitialized = -1;
-
- public final boolean isInitialized() {
- byte isInitialized = memoizedIsInitialized;
- if (isInitialized == 1)
- return true;
- if (isInitialized == 0)
- return false;
-
- memoizedIsInitialized = 1;
- return true;
- }
-
- public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (!getKeyBytes().isEmpty()) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 1, key_);
- }
- if (!getCodeBytes().isEmpty()) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 2, code_);
- }
- if (!getMessageBytes().isEmpty()) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 3, message_);
- }
- if (timestamp_ != 0L) {
- output.writeInt64(4, timestamp_);
- }
- com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(output, internalGetData(),
- DataDefaultEntryHolder.defaultEntry, 5);
- }
-
- public int getSerializedSize() {
- int size = memoizedSize;
- if (size != -1)
- return size;
-
- size = 0;
- if (!getKeyBytes().isEmpty()) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, key_);
- }
- if (!getCodeBytes().isEmpty()) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, code_);
- }
- if (!getMessageBytes().isEmpty()) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, message_);
- }
- if (timestamp_ != 0L) {
- size += com.google.protobuf.CodedOutputStream.computeInt64Size(4, timestamp_);
- }
- for (java.util.Map.Entry entry : internalGetData().getMap()
- .entrySet()) {
- com.google.protobuf.MapEntry data__ = DataDefaultEntryHolder.defaultEntry
- .newBuilderForType().setKey(entry.getKey()).setValue(entry.getValue()).build();
- size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, data__);
- }
- memoizedSize = size;
- return size;
- }
-
- private static final long serialVersionUID = 0L;
-
- @java.lang.Override
- public boolean equals(final java.lang.Object obj) {
- if (obj == this) {
- return true;
- }
- if (!(obj instanceof com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model)) {
- return super.equals(obj);
- }
- com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model other = (com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model) obj;
-
- boolean result = true;
- result = result && getKey().equals(other.getKey());
- result = result && getCode().equals(other.getCode());
- result = result && getMessage().equals(other.getMessage());
- result = result && (getTimestamp() == other.getTimestamp());
- result = result && internalGetData().equals(other.internalGetData());
- return result;
- }
-
- @java.lang.Override
- public int hashCode() {
- if (memoizedHashCode != 0) {
- return memoizedHashCode;
- }
- int hash = 41;
- hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + KEY_FIELD_NUMBER;
- hash = (53 * hash) + getKey().hashCode();
- hash = (37 * hash) + CODE_FIELD_NUMBER;
- hash = (53 * hash) + getCode().hashCode();
- hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
- hash = (53 * hash) + getMessage().hashCode();
- hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
- hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getTimestamp());
- if (!internalGetData().getMap().isEmpty()) {
- hash = (37 * hash) + DATA_FIELD_NUMBER;
- hash = (53 * hash) + internalGetData().hashCode();
- }
- hash = (29 * hash) + unknownFields.hashCode();
- memoizedHashCode = hash;
- return hash;
- }
-
- public static com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model parseFrom(
- com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
-
- public static com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model parseFrom(
- com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
-
- public static com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model parseFrom(byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model parseFrom(java.io.InputStream input)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model parseFrom(java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model parseDelimitedFrom(
- java.io.InputStream input) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model parseDelimitedFrom(
- java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input,
- extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model parseFrom(
- com.google.protobuf.CodedInputStream input) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model parseFrom(
- com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry);
- }
-
- public Builder newBuilderForType() {
- return newBuilder();
- }
-
- public static Builder newBuilder() {
- return DEFAULT_INSTANCE.toBuilder();
- }
-
- public static Builder newBuilder(com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model prototype) {
- return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- public Builder toBuilder() {
- return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
- }
-
- @java.lang.Override
- protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- Builder builder = new Builder(parent);
- return builder;
- }
-
- /**
- * Protobuf type {@code com.farsunset.cim.sdk.model.proto.Model}
- */
- public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements
- // @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.model.proto.Model)
- com.farsunset.cim.sdk.model.proto.ReplyBodyProto.ModelOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return com.farsunset.cim.sdk.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMapField(int number) {
- switch (number) {
- case 5:
- return internalGetData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
- switch (number) {
- case 5:
- return internalGetMutableData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
- .ensureFieldAccessorsInitialized(com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model.class,
- com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model.Builder.class);
- }
-
- // Construct using
- // com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
-
- private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- super(parent);
- maybeForceBuilderInitialization();
- }
-
- private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
- }
- }
-
- public Builder clear() {
- super.clear();
- key_ = "";
-
- code_ = "";
-
- message_ = "";
-
- timestamp_ = 0L;
-
- internalGetMutableData().clear();
- return this;
- }
-
- public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
- return com.farsunset.cim.sdk.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
- }
-
- public com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model getDefaultInstanceForType() {
- return com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model.getDefaultInstance();
- }
-
- public com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model build() {
- com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(result);
- }
- return result;
- }
-
- public com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model buildPartial() {
- com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model result = new com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model(
- this);
- int from_bitField0_ = bitField0_;
- int to_bitField0_ = 0;
- result.key_ = key_;
- result.code_ = code_;
- result.message_ = message_;
- result.timestamp_ = timestamp_;
- result.data_ = internalGetData();
- result.data_.makeImmutable();
- result.bitField0_ = to_bitField0_;
- onBuilt();
- return result;
- }
-
- public Builder clone() {
- return (Builder) super.clone();
- }
-
- public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
- return (Builder) super.setField(field, value);
- }
-
- public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
- return (Builder) super.clearField(field);
- }
-
- public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
- return (Builder) super.clearOneof(oneof);
- }
-
- public Builder setRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, int index,
- Object value) {
- return (Builder) super.setRepeatedField(field, index, value);
- }
-
- public Builder addRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
- return (Builder) super.addRepeatedField(field, value);
- }
-
- public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model) {
- return mergeFrom((com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model) other);
- } else {
- super.mergeFrom(other);
- return this;
- }
- }
-
- public Builder mergeFrom(com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model other) {
- if (other == com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model.getDefaultInstance())
- return this;
- if (!other.getKey().isEmpty()) {
- key_ = other.key_;
- onChanged();
- }
- if (!other.getCode().isEmpty()) {
- code_ = other.code_;
- onChanged();
- }
- if (!other.getMessage().isEmpty()) {
- message_ = other.message_;
- onChanged();
- }
- if (other.getTimestamp() != 0L) {
- setTimestamp(other.getTimestamp());
- }
- internalGetMutableData().mergeFrom(other.internalGetData());
- onChanged();
- return this;
- }
-
- public final boolean isInitialized() {
- return true;
- }
-
- public Builder mergeFrom(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
- com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model parsedMessage = null;
- try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model) e.getUnfinishedMessage();
- throw e.unwrapIOException();
- } finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
- return this;
- }
-
- private int bitField0_;
-
- private java.lang.Object key_ = "";
-
- /**
- * string key = 1;
- */
- public java.lang.String getKey() {
- java.lang.Object ref = key_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- key_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
-
- /**
- * string key = 1;
- */
- public com.google.protobuf.ByteString getKeyBytes() {
- java.lang.Object ref = key_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString
- .copyFromUtf8((java.lang.String) ref);
- key_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- /**
- * string key = 1;
- */
- public Builder setKey(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
-
- key_ = value;
- onChanged();
- return this;
- }
-
- /**
- * string key = 1;
- */
- public Builder clearKey() {
-
- key_ = getDefaultInstance().getKey();
- onChanged();
- return this;
- }
-
- /**
- * string key = 1;
- */
- public Builder setKeyBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
-
- key_ = value;
- onChanged();
- return this;
- }
-
- private java.lang.Object code_ = "";
-
- /**
- * string code = 2;
- */
- public java.lang.String getCode() {
- java.lang.Object ref = code_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- code_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
-
- /**
- * string code = 2;
- */
- public com.google.protobuf.ByteString getCodeBytes() {
- java.lang.Object ref = code_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString
- .copyFromUtf8((java.lang.String) ref);
- code_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- /**
- * string code = 2;
- */
- public Builder setCode(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
-
- code_ = value;
- onChanged();
- return this;
- }
-
- /**
- * string code = 2;
- */
- public Builder clearCode() {
-
- code_ = getDefaultInstance().getCode();
- onChanged();
- return this;
- }
-
- /**
- * string code = 2;
- */
- public Builder setCodeBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
-
- code_ = value;
- onChanged();
- return this;
- }
-
- private java.lang.Object message_ = "";
-
- /**
- * string message = 3;
- */
- public java.lang.String getMessage() {
- java.lang.Object ref = message_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- message_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
-
- /**
- * string message = 3;
- */
- public com.google.protobuf.ByteString getMessageBytes() {
- java.lang.Object ref = message_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString
- .copyFromUtf8((java.lang.String) ref);
- message_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- /**
- * string message = 3;
- */
- public Builder setMessage(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
-
- message_ = value;
- onChanged();
- return this;
- }
-
- /**
- * string message = 3;
- */
- public Builder clearMessage() {
-
- message_ = getDefaultInstance().getMessage();
- onChanged();
- return this;
- }
-
- /**
- * string message = 3;
- */
- public Builder setMessageBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
-
- message_ = value;
- onChanged();
- return this;
- }
-
- private long timestamp_;
-
- /**
- * int64 timestamp = 4;
- */
- public long getTimestamp() {
- return timestamp_;
- }
-
- /**
- * int64 timestamp = 4;
- */
- public Builder setTimestamp(long value) {
-
- timestamp_ = value;
- onChanged();
- return this;
- }
-
- /**
- * int64 timestamp = 4;
- */
- public Builder clearTimestamp() {
-
- timestamp_ = 0L;
- onChanged();
- return this;
- }
-
- private com.google.protobuf.MapField data_;
-
- private com.google.protobuf.MapField internalGetData() {
- if (data_ == null) {
- return com.google.protobuf.MapField.emptyMapField(DataDefaultEntryHolder.defaultEntry);
- }
- return data_;
- }
-
- private com.google.protobuf.MapField internalGetMutableData() {
- onChanged();
- ;
- if (data_ == null) {
- data_ = com.google.protobuf.MapField.newMapField(DataDefaultEntryHolder.defaultEntry);
- }
- if (!data_.isMutable()) {
- data_ = data_.copy();
- }
- return data_;
- }
-
- public int getDataCount() {
- return internalGetData().getMap().size();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public boolean containsData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- return internalGetData().getMap().containsKey(key);
- }
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- public java.util.Map getData() {
- return getDataMap();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.util.Map getDataMap() {
- return internalGetData().getMap();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- return map.containsKey(key) ? map.get(key) : defaultValue;
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.lang.String getDataOrThrow(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
- }
- return map.get(key);
- }
-
- public Builder clearData() {
- internalGetMutableData().getMutableMap().clear();
- return this;
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public Builder removeData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- internalGetMutableData().getMutableMap().remove(key);
- return this;
- }
-
- /**
- * Use alternate mutation accessors instead.
- */
- @java.lang.Deprecated
- public java.util.Map getMutableData() {
- return internalGetMutableData().getMutableMap();
- }
-
- /**
- * map<string, string> data = 5;
- */
- public Builder putData(java.lang.String key, java.lang.String value) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- if (value == null) {
- throw new java.lang.NullPointerException();
- }
- internalGetMutableData().getMutableMap().put(key, value);
- return this;
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public Builder putAllData(java.util.Map values) {
- internalGetMutableData().getMutableMap().putAll(values);
- return this;
- }
-
- public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- public final Builder mergeUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- // @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.model.proto.Model)
- }
-
- // @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.model.proto.Model)
- private static final com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model DEFAULT_INSTANCE;
- static {
- DEFAULT_INSTANCE = new com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model();
- }
-
- public static com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model getDefaultInstance() {
- return DEFAULT_INSTANCE;
- }
-
- private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() {
- public Model parsePartialFrom(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return new Model(input, extensionRegistry);
- }
- };
-
- public static com.google.protobuf.Parser parser() {
- return PARSER;
- }
-
- @java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
- return PARSER;
- }
-
- public com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model getDefaultInstanceForType() {
- return DEFAULT_INSTANCE;
- }
-
- }
-
- private static final com.google.protobuf.Descriptors.Descriptor internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
- private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable;
- private static final com.google.protobuf.Descriptors.Descriptor internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor;
- private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_fieldAccessorTable;
-
- public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
- return descriptor;
- }
-
- private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
- static {
- java.lang.String[] descriptorData = { "\n\017ReplyBody.proto\022!com.farsunset.cim.sdk"
- + ".model.proto\"\265\001\n\005Model\022\013\n\003key\030\001 \001(\t\022\014\n\004c"
- + "ode\030\002 \001(\t\022\017\n\007message\030\003 \001(\t\022\021\n\ttimestamp\030"
- + "\004 \001(\003\022@\n\004data\030\005 \003(\01322.com.farsunset.cim."
- + "sdk.model.proto.Model.DataEntry\032+\n\tDataE"
- + "ntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\020B\016"
- + "ReplyBodyProtob\006proto3" };
- com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- return null;
- }
- };
- com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData,
- new com.google.protobuf.Descriptors.FileDescriptor[] {}, assigner);
- internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor = getDescriptor().getMessageTypes().get(0);
- internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor,
- new java.lang.String[] { "Key", "Code", "Message", "Timestamp", "Data", });
- internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor = internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor
- .getNestedTypes().get(0);
- internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor,
- new java.lang.String[] { "Key", "Value", });
- }
-
- // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/SentBodyProto.java b/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/SentBodyProto.java
deleted file mode 100644
index 396ac07..0000000
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/SentBodyProto.java
+++ /dev/null
@@ -1,931 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.model.proto;
-
-public final class SentBodyProto {
- private SentBodyProto() {
- }
-
- public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {
- }
-
- public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
- registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
- }
-
- public interface ModelOrBuilder extends
- // @@protoc_insertion_point(interface_extends:com.farsunset.cim.sdk.model.proto.Model)
- com.google.protobuf.MessageOrBuilder {
-
- /**
- * string key = 1;
- */
- java.lang.String getKey();
-
- /**
- * string key = 1;
- */
- com.google.protobuf.ByteString getKeyBytes();
-
- /**
- * int64 timestamp = 2;
- */
- long getTimestamp();
-
- /**
- * map<string, string> data = 3;
- */
- int getDataCount();
-
- /**
- * map<string, string> data = 3;
- */
- boolean containsData(java.lang.String key);
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- java.util.Map getData();
-
- /**
- * map<string, string> data = 3;
- */
- java.util.Map getDataMap();
-
- /**
- * map<string, string> data = 3;
- */
-
- java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue);
-
- /**
- * map<string, string> data = 3;
- */
-
- java.lang.String getDataOrThrow(java.lang.String key);
- }
-
- /**
- * Protobuf type {@code com.farsunset.cim.sdk.model.proto.Model}
- */
- public static final class Model extends com.google.protobuf.GeneratedMessageV3 implements
- // @@protoc_insertion_point(message_implements:com.farsunset.cim.sdk.model.proto.Model)
- ModelOrBuilder {
- // Use Model.newBuilder() to construct.
- private Model(com.google.protobuf.GeneratedMessageV3.Builder builder) {
- super(builder);
- }
-
- private Model() {
- key_ = "";
- timestamp_ = 0L;
- }
-
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
- }
-
- private Model(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- this();
- int mutable_bitField0_ = 0;
- try {
- boolean done = false;
- while (!done) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- done = true;
- break;
- default: {
- if (!input.skipField(tag)) {
- done = true;
- }
- break;
- }
- case 10: {
- java.lang.String s = input.readStringRequireUtf8();
-
- key_ = s;
- break;
- }
- case 16: {
-
- timestamp_ = input.readInt64();
- break;
- }
- case 26: {
- if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
- data_ = com.google.protobuf.MapField.newMapField(DataDefaultEntryHolder.defaultEntry);
- mutable_bitField0_ |= 0x00000004;
- }
- com.google.protobuf.MapEntry data__ = input
- .readMessage(DataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
- data_.getMutableMap().put(data__.getKey(), data__.getValue());
- break;
- }
- }
- }
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw e.setUnfinishedMessage(this);
- } catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
- } finally {
- makeExtensionsImmutable();
- }
- }
-
- public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return com.farsunset.cim.sdk.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMapField(int number) {
- switch (number) {
- case 3:
- return internalGetData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
- .ensureFieldAccessorsInitialized(com.farsunset.cim.sdk.model.proto.SentBodyProto.Model.class,
- com.farsunset.cim.sdk.model.proto.SentBodyProto.Model.Builder.class);
- }
-
- private int bitField0_;
- public static final int KEY_FIELD_NUMBER = 1;
- private volatile java.lang.Object key_;
-
- /**
- * string key = 1;
- */
- public java.lang.String getKey() {
- java.lang.Object ref = key_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- key_ = s;
- return s;
- }
- }
-
- /**
- * string key = 1;
- */
- public com.google.protobuf.ByteString getKeyBytes() {
- java.lang.Object ref = key_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- key_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- public static final int TIMESTAMP_FIELD_NUMBER = 2;
- private long timestamp_;
-
- /**
- * int64 timestamp = 2;
- */
- public long getTimestamp() {
- return timestamp_;
- }
-
- public static final int DATA_FIELD_NUMBER = 3;
-
- private static final class DataDefaultEntryHolder {
- static final com.google.protobuf.MapEntry defaultEntry = com.google.protobuf.MapEntry.newDefaultInstance(
- com.farsunset.cim.sdk.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor,
- com.google.protobuf.WireFormat.FieldType.STRING, "",
- com.google.protobuf.WireFormat.FieldType.STRING, "");
- }
-
- private com.google.protobuf.MapField data_;
-
- private com.google.protobuf.MapField internalGetData() {
- if (data_ == null) {
- return com.google.protobuf.MapField.emptyMapField(DataDefaultEntryHolder.defaultEntry);
- }
- return data_;
- }
-
- public int getDataCount() {
- return internalGetData().getMap().size();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public boolean containsData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- return internalGetData().getMap().containsKey(key);
- }
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- public java.util.Map getData() {
- return getDataMap();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.util.Map getDataMap() {
- return internalGetData().getMap();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- return map.containsKey(key) ? map.get(key) : defaultValue;
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.lang.String getDataOrThrow(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
- }
- return map.get(key);
- }
-
- private byte memoizedIsInitialized = -1;
-
- public final boolean isInitialized() {
- byte isInitialized = memoizedIsInitialized;
- if (isInitialized == 1)
- return true;
- if (isInitialized == 0)
- return false;
-
- memoizedIsInitialized = 1;
- return true;
- }
-
- public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (!getKeyBytes().isEmpty()) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 1, key_);
- }
- if (timestamp_ != 0L) {
- output.writeInt64(2, timestamp_);
- }
- com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(output, internalGetData(),
- DataDefaultEntryHolder.defaultEntry, 3);
- }
-
- public int getSerializedSize() {
- int size = memoizedSize;
- if (size != -1)
- return size;
-
- size = 0;
- if (!getKeyBytes().isEmpty()) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, key_);
- }
- if (timestamp_ != 0L) {
- size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, timestamp_);
- }
- for (java.util.Map.Entry entry : internalGetData().getMap()
- .entrySet()) {
- com.google.protobuf.MapEntry data__ = DataDefaultEntryHolder.defaultEntry
- .newBuilderForType().setKey(entry.getKey()).setValue(entry.getValue()).build();
- size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, data__);
- }
- memoizedSize = size;
- return size;
- }
-
- private static final long serialVersionUID = 0L;
-
- @java.lang.Override
- public boolean equals(final java.lang.Object obj) {
- if (obj == this) {
- return true;
- }
- if (!(obj instanceof com.farsunset.cim.sdk.model.proto.SentBodyProto.Model)) {
- return super.equals(obj);
- }
- com.farsunset.cim.sdk.model.proto.SentBodyProto.Model other = (com.farsunset.cim.sdk.model.proto.SentBodyProto.Model) obj;
-
- boolean result = true;
- result = result && getKey().equals(other.getKey());
- result = result && (getTimestamp() == other.getTimestamp());
- result = result && internalGetData().equals(other.internalGetData());
- return result;
- }
-
- @java.lang.Override
- public int hashCode() {
- if (memoizedHashCode != 0) {
- return memoizedHashCode;
- }
- int hash = 41;
- hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + KEY_FIELD_NUMBER;
- hash = (53 * hash) + getKey().hashCode();
- hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
- hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getTimestamp());
- if (!internalGetData().getMap().isEmpty()) {
- hash = (37 * hash) + DATA_FIELD_NUMBER;
- hash = (53 * hash) + internalGetData().hashCode();
- }
- hash = (29 * hash) + unknownFields.hashCode();
- memoizedHashCode = hash;
- return hash;
- }
-
- public static com.farsunset.cim.sdk.model.proto.SentBodyProto.Model parseFrom(
- com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
-
- public static com.farsunset.cim.sdk.model.proto.SentBodyProto.Model parseFrom(
- com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.model.proto.SentBodyProto.Model parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
-
- public static com.farsunset.cim.sdk.model.proto.SentBodyProto.Model parseFrom(byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.model.proto.SentBodyProto.Model parseFrom(java.io.InputStream input)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.model.proto.SentBodyProto.Model parseFrom(java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.model.proto.SentBodyProto.Model parseDelimitedFrom(
- java.io.InputStream input) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.model.proto.SentBodyProto.Model parseDelimitedFrom(
- java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input,
- extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.model.proto.SentBodyProto.Model parseFrom(
- com.google.protobuf.CodedInputStream input) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.model.proto.SentBodyProto.Model parseFrom(
- com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry);
- }
-
- public Builder newBuilderForType() {
- return newBuilder();
- }
-
- public static Builder newBuilder() {
- return DEFAULT_INSTANCE.toBuilder();
- }
-
- public static Builder newBuilder(com.farsunset.cim.sdk.model.proto.SentBodyProto.Model prototype) {
- return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- public Builder toBuilder() {
- return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
- }
-
- @java.lang.Override
- protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- Builder builder = new Builder(parent);
- return builder;
- }
-
- /**
- * Protobuf type {@code com.farsunset.cim.sdk.model.proto.Model}
- */
- public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements
- // @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.model.proto.Model)
- com.farsunset.cim.sdk.model.proto.SentBodyProto.ModelOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return com.farsunset.cim.sdk.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMapField(int number) {
- switch (number) {
- case 3:
- return internalGetData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
- switch (number) {
- case 3:
- return internalGetMutableData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
- .ensureFieldAccessorsInitialized(com.farsunset.cim.sdk.model.proto.SentBodyProto.Model.class,
- com.farsunset.cim.sdk.model.proto.SentBodyProto.Model.Builder.class);
- }
-
- // Construct using
- // com.farsunset.cim.sdk.model.proto.SentBodyProto.Model.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
-
- private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- super(parent);
- maybeForceBuilderInitialization();
- }
-
- private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
- }
- }
-
- public Builder clear() {
- super.clear();
- key_ = "";
-
- timestamp_ = 0L;
-
- internalGetMutableData().clear();
- return this;
- }
-
- public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
- return com.farsunset.cim.sdk.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
- }
-
- public com.farsunset.cim.sdk.model.proto.SentBodyProto.Model getDefaultInstanceForType() {
- return com.farsunset.cim.sdk.model.proto.SentBodyProto.Model.getDefaultInstance();
- }
-
- public com.farsunset.cim.sdk.model.proto.SentBodyProto.Model build() {
- com.farsunset.cim.sdk.model.proto.SentBodyProto.Model result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(result);
- }
- return result;
- }
-
- public com.farsunset.cim.sdk.model.proto.SentBodyProto.Model buildPartial() {
- com.farsunset.cim.sdk.model.proto.SentBodyProto.Model result = new com.farsunset.cim.sdk.model.proto.SentBodyProto.Model(
- this);
- int from_bitField0_ = bitField0_;
- int to_bitField0_ = 0;
- result.key_ = key_;
- result.timestamp_ = timestamp_;
- result.data_ = internalGetData();
- result.data_.makeImmutable();
- result.bitField0_ = to_bitField0_;
- onBuilt();
- return result;
- }
-
- public Builder clone() {
- return (Builder) super.clone();
- }
-
- public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
- return (Builder) super.setField(field, value);
- }
-
- public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
- return (Builder) super.clearField(field);
- }
-
- public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
- return (Builder) super.clearOneof(oneof);
- }
-
- public Builder setRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, int index,
- Object value) {
- return (Builder) super.setRepeatedField(field, index, value);
- }
-
- public Builder addRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
- return (Builder) super.addRepeatedField(field, value);
- }
-
- public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof com.farsunset.cim.sdk.model.proto.SentBodyProto.Model) {
- return mergeFrom((com.farsunset.cim.sdk.model.proto.SentBodyProto.Model) other);
- } else {
- super.mergeFrom(other);
- return this;
- }
- }
-
- public Builder mergeFrom(com.farsunset.cim.sdk.model.proto.SentBodyProto.Model other) {
- if (other == com.farsunset.cim.sdk.model.proto.SentBodyProto.Model.getDefaultInstance())
- return this;
- if (!other.getKey().isEmpty()) {
- key_ = other.key_;
- onChanged();
- }
- if (other.getTimestamp() != 0L) {
- setTimestamp(other.getTimestamp());
- }
- internalGetMutableData().mergeFrom(other.internalGetData());
- onChanged();
- return this;
- }
-
- public final boolean isInitialized() {
- return true;
- }
-
- public Builder mergeFrom(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
- com.farsunset.cim.sdk.model.proto.SentBodyProto.Model parsedMessage = null;
- try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (com.farsunset.cim.sdk.model.proto.SentBodyProto.Model) e.getUnfinishedMessage();
- throw e.unwrapIOException();
- } finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
- return this;
- }
-
- private int bitField0_;
-
- private java.lang.Object key_ = "";
-
- /**
- * string key = 1;
- */
- public java.lang.String getKey() {
- java.lang.Object ref = key_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- key_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
-
- /**
- * string key = 1;
- */
- public com.google.protobuf.ByteString getKeyBytes() {
- java.lang.Object ref = key_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString
- .copyFromUtf8((java.lang.String) ref);
- key_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- /**
- * string key = 1;
- */
- public Builder setKey(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
-
- key_ = value;
- onChanged();
- return this;
- }
-
- /**
- * string key = 1;
- */
- public Builder clearKey() {
-
- key_ = getDefaultInstance().getKey();
- onChanged();
- return this;
- }
-
- /**
- * string key = 1;
- */
- public Builder setKeyBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
-
- key_ = value;
- onChanged();
- return this;
- }
-
- private long timestamp_;
-
- /**
- * int64 timestamp = 2;
- */
- public long getTimestamp() {
- return timestamp_;
- }
-
- /**
- * int64 timestamp = 2;
- */
- public Builder setTimestamp(long value) {
-
- timestamp_ = value;
- onChanged();
- return this;
- }
-
- /**
- * int64 timestamp = 2;
- */
- public Builder clearTimestamp() {
-
- timestamp_ = 0L;
- onChanged();
- return this;
- }
-
- private com.google.protobuf.MapField data_;
-
- private com.google.protobuf.MapField internalGetData() {
- if (data_ == null) {
- return com.google.protobuf.MapField.emptyMapField(DataDefaultEntryHolder.defaultEntry);
- }
- return data_;
- }
-
- private com.google.protobuf.MapField internalGetMutableData() {
- onChanged();
- ;
- if (data_ == null) {
- data_ = com.google.protobuf.MapField.newMapField(DataDefaultEntryHolder.defaultEntry);
- }
- if (!data_.isMutable()) {
- data_ = data_.copy();
- }
- return data_;
- }
-
- public int getDataCount() {
- return internalGetData().getMap().size();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public boolean containsData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- return internalGetData().getMap().containsKey(key);
- }
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- public java.util.Map getData() {
- return getDataMap();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.util.Map getDataMap() {
- return internalGetData().getMap();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- return map.containsKey(key) ? map.get(key) : defaultValue;
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.lang.String getDataOrThrow(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
- }
- return map.get(key);
- }
-
- public Builder clearData() {
- internalGetMutableData().getMutableMap().clear();
- return this;
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public Builder removeData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- internalGetMutableData().getMutableMap().remove(key);
- return this;
- }
-
- /**
- * Use alternate mutation accessors instead.
- */
- @java.lang.Deprecated
- public java.util.Map getMutableData() {
- return internalGetMutableData().getMutableMap();
- }
-
- /**
- * map<string, string> data = 3;
- */
- public Builder putData(java.lang.String key, java.lang.String value) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- if (value == null) {
- throw new java.lang.NullPointerException();
- }
- internalGetMutableData().getMutableMap().put(key, value);
- return this;
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public Builder putAllData(java.util.Map values) {
- internalGetMutableData().getMutableMap().putAll(values);
- return this;
- }
-
- public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- public final Builder mergeUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- // @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.model.proto.Model)
- }
-
- // @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.model.proto.Model)
- private static final com.farsunset.cim.sdk.model.proto.SentBodyProto.Model DEFAULT_INSTANCE;
- static {
- DEFAULT_INSTANCE = new com.farsunset.cim.sdk.model.proto.SentBodyProto.Model();
- }
-
- public static com.farsunset.cim.sdk.model.proto.SentBodyProto.Model getDefaultInstance() {
- return DEFAULT_INSTANCE;
- }
-
- private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() {
- public Model parsePartialFrom(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return new Model(input, extensionRegistry);
- }
- };
-
- public static com.google.protobuf.Parser parser() {
- return PARSER;
- }
-
- @java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
- return PARSER;
- }
-
- public com.farsunset.cim.sdk.model.proto.SentBodyProto.Model getDefaultInstanceForType() {
- return DEFAULT_INSTANCE;
- }
-
- }
-
- private static final com.google.protobuf.Descriptors.Descriptor internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
- private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable;
- private static final com.google.protobuf.Descriptors.Descriptor internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor;
- private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_fieldAccessorTable;
-
- public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
- return descriptor;
- }
-
- private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
- static {
- java.lang.String[] descriptorData = { "\n\016SentBody.proto\022!com.farsunset.cim.sdk."
- + "model.proto\"\226\001\n\005Model\022\013\n\003key\030\001 \001(\t\022\021\n\tti"
- + "mestamp\030\002 \001(\003\022@\n\004data\030\003 \003(\01322.com.farsun"
- + "set.cim.sdk.model.proto.Model.DataEntry\032"
- + "+\n\tDataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t"
- + ":\0028\001B\017B\rSentBodyProtob\006proto3" };
- com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- return null;
- }
- };
- com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData,
- new com.google.protobuf.Descriptors.FileDescriptor[] {}, assigner);
- internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor = getDescriptor().getMessageTypes().get(0);
- internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor,
- new java.lang.String[] { "Key", "Timestamp", "Data", });
- internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor = internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor
- .getNestedTypes().get(0);
- internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor,
- new java.lang.String[] { "Key", "Value", });
- }
-
- // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMCacheManager.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMCacheManager.java
similarity index 91%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMCacheManager.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMCacheManager.java
index dc1b485..f405ad5 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMCacheManager.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMCacheManager.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,9 +31,9 @@ class CIMCacheManager {
public static final String KEY_CIM_DESTROYED = "KEY_CIM_DESTROYED";
- public static final String KEY_CIM_SERVIER_HOST = "KEY_CIM_SERVIER_HOST";
+ public static final String KEY_CIM_SERVER_HOST = "KEY_CIM_SERVER_HOST";
- public static final String KEY_CIM_SERVIER_PORT = "KEY_CIM_SERVIER_PORT";
+ public static final String KEY_CIM_SERVER_PORT = "KEY_CIM_SERVER_PORT";
public static final String KEY_CIM_CONNECTION_STATE = "KEY_CIM_CONNECTION_STATE";
@@ -65,7 +65,7 @@ class CIMCacheManager {
public boolean getBoolean(String key) {
String value = getString(key);
- return value == null ? false : Boolean.parseBoolean(value);
+ return Boolean.parseBoolean(value);
}
public void putInt(String key, int value) {
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMConnectorManager.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMConnectorManager.java
similarity index 63%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMConnectorManager.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMConnectorManager.java
index 4ec39e5..112edaa 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMConnectorManager.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMConnectorManager.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +31,6 @@ import java.util.Random;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore;
-import java.util.concurrent.ThreadFactory;
import com.farsunset.cim.sdk.client.coder.CIMLogger;
import com.farsunset.cim.sdk.client.coder.ClientMessageDecoder;
@@ -65,24 +64,9 @@ class CIMConnectorManager {
private ByteBuffer readBuffer = ByteBuffer.allocate(READ_BUFFER_SIZE);
- private ExecutorService workerExecutor = Executors.newFixedThreadPool(1,new ThreadFactory() {
- @Override
- public Thread newThread(Runnable r) {
- return new Thread(r,"worker-");
- }
- });
- private ExecutorService bossExecutor = Executors.newFixedThreadPool(1,new ThreadFactory() {
- @Override
- public Thread newThread(Runnable r) {
- return new Thread(r,"boss-");
- }
- });
- private ExecutorService eventExecutor = Executors.newFixedThreadPool(1,new ThreadFactory() {
- @Override
- public Thread newThread(Runnable r) {
- return new Thread(r,"event-");
- }
- });
+ private ExecutorService workerExecutor = Executors.newFixedThreadPool(1, r -> new Thread(r,"worker-"));
+ private ExecutorService bossExecutor = Executors.newFixedThreadPool(1, r -> new Thread(r,"boss-"));
+ private ExecutorService eventExecutor = Executors.newFixedThreadPool(1, r -> new Thread(r,"event-"));
private Semaphore semaphore = new Semaphore(1, true);
@@ -109,62 +93,56 @@ class CIMConnectorManager {
return;
}
- bossExecutor.execute(new Runnable() {
- @Override
- public void run() {
+ bossExecutor.execute(() -> {
- if (isConnected()) {
- return;
- }
-
- LOGGER.startConnect(host, port);
-
- CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_CIM_CONNECTION_STATE, false);
-
- try {
-
- semaphore.acquire();
+ if (isConnected()) {
+ return;
+ }
- socketChannel = SocketChannel.open();
- socketChannel.configureBlocking(true);
- socketChannel.socket().setTcpNoDelay(true);
- socketChannel.socket().setKeepAlive(true);
- socketChannel.socket().setReceiveBufferSize(READ_BUFFER_SIZE);
- socketChannel.socket().setSendBufferSize(WRITE_BUFFER_SIZE);
-
- socketChannel.socket().connect(new InetSocketAddress(host, port),CONNECT_TIME_OUT);
-
- semaphore.release();
-
- handelConnectedEvent();
-
-
- int result = -1;
-
- while((result = socketChannel.read(readBuffer)) > 0) {
-
- if(readBuffer.position() == readBuffer.capacity()) {
- extendByteBuffer();
- }
-
- handelSocketReadEvent(result);
-
+ LOGGER.startConnect(host, port);
+
+ CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_CIM_CONNECTION_STATE, false);
+
+ try {
+
+ semaphore.acquire();
+
+ socketChannel = SocketChannel.open();
+ socketChannel.configureBlocking(true);
+ socketChannel.socket().setTcpNoDelay(true);
+ socketChannel.socket().setKeepAlive(true);
+ socketChannel.socket().setReceiveBufferSize(READ_BUFFER_SIZE);
+ socketChannel.socket().setSendBufferSize(WRITE_BUFFER_SIZE);
+
+ socketChannel.socket().connect(new InetSocketAddress(host, port),CONNECT_TIME_OUT);
+
+ semaphore.release();
+
+ handelConnectedEvent();
+
+
+ int result = -1;
+
+ while((result = socketChannel.read(readBuffer)) > 0) {
+
+ if(readBuffer.position() == readBuffer.capacity()) {
+ extendByteBuffer();
}
-
+
handelSocketReadEvent(result);
-
- }catch(ConnectException ignore){
- semaphore.release();
- handleConnectAbortedEvent();
- }catch(SocketTimeoutException ignore){
- semaphore.release();
- handleConnectAbortedEvent();
- }catch(IOException ignore) {
- semaphore.release();
- handelDisconnectedEvent();
- }catch (InterruptedException ignore) {
- semaphore.release();
- }
+
+ }
+
+ handelSocketReadEvent(result);
+
+ }catch(ConnectException | SocketTimeoutException ignore){
+ semaphore.release();
+ handleConnectAbortedEvent();
+ } catch(IOException ignore) {
+ semaphore.release();
+ handelDisconnectedEvent();
+ }catch (InterruptedException ignore) {
+ semaphore.release();
}
});
}
@@ -177,23 +155,23 @@ class CIMConnectorManager {
private void handleConnectAbortedEvent() {
- long interval = CIMConstant.RECONN_INTERVAL_TIME - (5 * 1000 - new Random().nextInt(15 * 1000));
+ long interval = CIMConstant.RECONNECT_INTERVAL_TIME - (5 * 1000 - new Random().nextInt(15 * 1000));
LOGGER.connectFailure(interval);
Intent intent = new Intent();
- intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED);
+ intent.setAction(CIMConstant.IntentAction.ACTION_CONNECT_FAILED);
intent.putExtra("interval", interval);
sendBroadcast(intent);
}
- private void handelConnectedEvent() throws IOException {
+ private void handelConnectedEvent() {
sessionCreated();
}
- private void handelSocketReadEvent(int result) throws IOException {
+ private void handelSocketReadEvent(int result) {
if(result == -1) {
closeSession();
@@ -239,32 +217,28 @@ class CIMConnectorManager {
return;
}
- workerExecutor.execute(new Runnable() {
-
- @Override
- public void run() {
- int result = 0;
- try {
-
- semaphore.acquire();
-
- ByteBuffer buffer = messageEncoder.encode(body);
- while(buffer.hasRemaining()){
- result += socketChannel.write(buffer);
- }
-
- } catch (Exception e) {
- result = -1;
- }finally {
-
- semaphore.release();
-
- if(result <= 0) {
- closeSession();
- }else {
- messageSent(body);
- }
- }
+ workerExecutor.execute(() -> {
+ int result = 0;
+ try {
+
+ semaphore.acquire();
+
+ ByteBuffer buffer = messageEncoder.encode(body);
+ while(buffer.hasRemaining()){
+ result += socketChannel.write(buffer);
+ }
+
+ } catch (Exception e) {
+ result = -1;
+ }finally {
+
+ semaphore.release();
+
+ if(result <= 0) {
+ closeSession();
+ }else {
+ messageSent(body);
+ }
}
});
}
@@ -275,7 +249,7 @@ class CIMConnectorManager {
LOGGER.sessionCreated(socketChannel);
Intent intent = new Intent();
- intent.setAction(CIMConstant.IntentAction.ACTION_CONNECTION_SUCCESSED);
+ intent.setAction(CIMConstant.IntentAction.ACTION_CONNECT_FINISHED);
sendBroadcast(intent);
}
@@ -296,34 +270,34 @@ class CIMConnectorManager {
}
- public void messageReceived(Object obj) {
+ public void messageReceived(Object data) {
- if (obj instanceof Message) {
+ if (data instanceof Message) {
Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_MESSAGE_RECEIVED);
- intent.putExtra(Message.class.getName(), (Message) obj);
+ intent.putExtra(Message.class.getName(), data);
sendBroadcast(intent);
}
- if (obj instanceof ReplyBody) {
+ if (data instanceof ReplyBody) {
Intent intent = new Intent();
intent.setAction(CIMConstant.IntentAction.ACTION_REPLY_RECEIVED);
- intent.putExtra(ReplyBody.class.getName(), (ReplyBody) obj);
+ intent.putExtra(ReplyBody.class.getName(), data);
sendBroadcast(intent);
}
}
- public void messageSent(Object message) {
+ public void messageSent(Object data) {
- LOGGER.messageSent(socketChannel, message);
+ LOGGER.messageSent(socketChannel, data);
- if (message instanceof SentBody) {
+ if (data instanceof SentBody) {
Intent intent = new Intent();
- intent.setAction(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED);
- intent.putExtra(SentBody.class.getName(), (SentBody) message);
+ intent.setAction(CIMConstant.IntentAction.ACTION_SEND_FINISHED);
+ intent.putExtra(SentBody.class.getName(), data);
sendBroadcast(intent);
}
}
@@ -360,12 +334,7 @@ class CIMConnectorManager {
private void sendBroadcast(final Intent intent) {
- eventExecutor.execute(new Runnable() {
- @Override
- public void run() {
- CIMEventBroadcastReceiver.getInstance().onReceive(intent);
- }
- });
+ eventExecutor.execute(() -> CIMEventBroadcastReceiver.getInstance().onReceive(intent));
}
}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMEventBroadcastReceiver.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMEventBroadcastReceiver.java
similarity index 71%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMEventBroadcastReceiver.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMEventBroadcastReceiver.java
index ee0665b..123d5a4 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMEventBroadcastReceiver.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMEventBroadcastReceiver.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,9 +21,9 @@
*/
package com.farsunset.cim.sdk.client;
-import java.util.Random;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import com.farsunset.cim.sdk.client.constant.CIMConstant;
import com.farsunset.cim.sdk.client.model.Intent;
@@ -35,16 +35,23 @@ import com.farsunset.cim.sdk.client.model.SentBody;
* 消息入口，所有消息都会经过这里
*/
public class CIMEventBroadcastReceiver {
- Random random = new Random();
- private static CIMEventBroadcastReceiver recerver;
+ private static CIMEventBroadcastReceiver receiver;
private CIMEventListener listener;
- private Timer connectionHandler = new Timer();;
+ private ScheduledExecutorService executorService = new ScheduledThreadPoolExecutor(1, r -> {
+ Thread thread = new Thread(r);
+ thread.setName("cim-reconnect-");
+ return thread;
+ });
+
+ private CIMEventBroadcastReceiver(){
+
+ }
public static CIMEventBroadcastReceiver getInstance() {
- if (recerver == null) {
- recerver = new CIMEventBroadcastReceiver();
+ if (receiver == null) {
+ receiver = new CIMEventBroadcastReceiver();
}
- return recerver;
+ return receiver;
}
public void setGlobalCIMEventListener(CIMEventListener ls) {
@@ -63,16 +70,16 @@ public class CIMEventBroadcastReceiver {
/*
* cim连接服务器失败事件
*/
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_FAILED)) {
- long interval = intent.getLongExtra("interval", CIMConstant.RECONN_INTERVAL_TIME);
- onInnerConnectionFailed(interval);
+ if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECT_FAILED)) {
+ long interval = intent.getLongExtra("interval", CIMConstant.RECONNECT_INTERVAL_TIME);
+ onInnerConnectFailed(interval);
}
/*
* cim连接服务器成功事件
*/
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECTION_SUCCESSED)) {
- onInnerConnectionSuccessed();
+ if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_CONNECT_FINISHED)) {
+ onInnerConnectFinished();
}
/*
@@ -83,24 +90,17 @@ public class CIMEventBroadcastReceiver {
}
/*
- * 获取收到replybody成功事件
+ * 获取收到replyBody成功事件
*/
if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_REPLY_RECEIVED)) {
listener.onReplyReceived((ReplyBody) intent.getExtra(ReplyBody.class.getName()));
}
/*
- * 获取sendbody发送成功事件
+ * 获取sendBody发送成功事件
*/
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_SENT_SUCCESSED)) {
- onSentSucceed((SentBody) intent.getExtra(SentBody.class.getName()));
- }
-
- /*
- * 获取cim数据传输异常事件
- */
- if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_UNCAUGHT_EXCEPTION)) {
- onUncaughtException((Exception) intent.getExtra(Exception.class.getName()));
+ if (intent.getAction().equals(CIMConstant.IntentAction.ACTION_SEND_FINISHED)) {
+ onInnerSendFinished((SentBody) intent.getExtra(SentBody.class.getName()));
}
/*
@@ -120,25 +120,23 @@ public class CIMEventBroadcastReceiver {
}
- private void onInnerConnectionFailed(long interval) {
+ private void onInnerConnectFailed(long interval) {
- connectionHandler.schedule(new ConnectionTask(), interval);
+ executorService.schedule((Runnable) CIMPushManager::connect,interval, TimeUnit.MICROSECONDS);
- listener.onConnectionFailed();
+ listener.onConnectFailed();
}
- private void onInnerConnectionSuccessed() {
+ private void onInnerConnectFinished() {
CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_CIM_CONNECTION_STATE, true);
boolean autoBind = CIMPushManager.autoBindDeviceId();
- listener.onConnectionSuccessed(autoBind);
+ listener.onConnectFinished(autoBind);
}
- private void onUncaughtException(Throwable arg0) {
- }
- private void onInnerMessageReceived(com.farsunset.cim.sdk.client.model.Message message) {
+ private void onInnerMessageReceived(Message message) {
if (isForceOfflineMessage(message.getAction())) {
CIMPushManager.stop();
}
@@ -149,16 +147,9 @@ public class CIMEventBroadcastReceiver {
private boolean isForceOfflineMessage(String action) {
return CIMConstant.MessageAction.ACTION_999.equals(action);
}
-
- private void onSentSucceed(SentBody body) {
- }
-
- class ConnectionTask extends TimerTask {
-
- public void run() {
- CIMPushManager.connect();
- }
+ private void onInnerSendFinished(SentBody body) {
+ listener.onSendFinished(body);
}
}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMEventListener.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMEventListener.java
similarity index 84%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMEventListener.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMEventListener.java
index 3e3d026..d2dd606 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMEventListener.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMEventListener.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +23,7 @@ package com.farsunset.cim.sdk.client;
import com.farsunset.cim.sdk.client.model.Message;
import com.farsunset.cim.sdk.client.model.ReplyBody;
+import com.farsunset.cim.sdk.client.model.SentBody;
/**
* CIM 主要事件接口
@@ -39,9 +40,15 @@ public interface CIMEventListener {
/**
* 当调用CIMPushManager.sendRequest()向服务端发送请求，获得相应时调用
*
- * @param replybody
+ * @param body
*/
- void onReplyReceived(ReplyBody replybody);
+ void onReplyReceived(ReplyBody body);
+
+ /**
+ * 当调用CIMPushManager.sendRequest()向服务端发送请求成功
+ * @param body
+ */
+ void onSendFinished(SentBody body);
/**
* 当连接服务器成功时回调
@@ -49,7 +56,7 @@ public interface CIMEventListener {
* @param hasAutoBind
* : true 已经自动绑定账号到服务器了，不需要再手动调用bindAccount
*/
- void onConnectionSuccessed(boolean hasAutoBind);
+ void onConnectFinished(boolean hasAutoBind);
/**
* 当断开服务器连接的时候回调
@@ -60,10 +67,11 @@ public interface CIMEventListener {
* 当服务器连接失败的时候回调
*
*/
- void onConnectionFailed();
+ void onConnectFailed();
/**
* 监听器在容器里面的排序。值越大则越先接收
+ * @return 值越大优先级越高
*/
int getEventDispatchOrder();
}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMListenerManager.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMListenerManager.java
similarity index 97%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMListenerManager.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMListenerManager.java
index a16bc56..dd9f875 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMListenerManager.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMListenerManager.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,7 +58,7 @@ public class CIMListenerManager {
public static void notifyOnConnectionSuccessed(boolean antoBind) {
for (CIMEventListener listener : cimListeners) {
- listener.onConnectionSuccessed(antoBind);
+ listener.onConnectFinished(antoBind);
}
}
@@ -82,7 +82,7 @@ public class CIMListenerManager {
public static void notifyOnConnectionFailed() {
for (CIMEventListener listener : cimListeners) {
- listener.onConnectionFailed();
+ listener.onConnectFailed();
}
}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMPushManager.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMPushManager.java
similarity index 80%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMPushManager.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMPushManager.java
index ae25c27..360f198 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMPushManager.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMPushManager.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,21 +41,26 @@ public class CIMPushManager {
static String ACTION_CLOSE_CIM_CONNECTION = "ACTION_CLOSE_CIM_CONNECTION";
- static String ACTION_DESTORY = "ACTION_DESTORY";
+ static String ACTION_DESTROY = "ACTION_DESTROY";
- static String KEY_CIM_CONNECTION_STATUS = "KEY_CIM_CONNECTION_STATUS";
- // 被销毁的destroy()
+ /**
+ * 销毁的
+ */
public static final int STATE_DESTROYED = 0x0000DE;
- // 被销停止的 stop()
- public static final int STATE_STOPED = 0x0000EE;
+ /**
+ * 停止推送
+ */
+ public static final int STATE_STOPPED = 0x0000EE;
+ /**
+ * 正常
+ */
public static final int STATE_NORMAL = 0x000000;
/**
* 初始化,连接服务端，在程序启动页或者 在Application里调用
*
- * @param context
* @param ip
* @param port
*/
@@ -65,12 +70,12 @@ public class CIMPushManager {
CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_CIM_DESTROYED, false);
CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_MANUAL_STOP, false);
- CIMCacheManager.getInstance().putString(CIMCacheManager.KEY_CIM_SERVIER_HOST, ip);
- CIMCacheManager.getInstance().putInt(CIMCacheManager.KEY_CIM_SERVIER_PORT, port);
+ CIMCacheManager.getInstance().putString(CIMCacheManager.KEY_CIM_SERVER_HOST, ip);
+ CIMCacheManager.getInstance().putInt(CIMCacheManager.KEY_CIM_SERVER_PORT, port);
Intent serviceIntent = new Intent();
- serviceIntent.putExtra(CIMCacheManager.KEY_CIM_SERVIER_HOST, ip);
- serviceIntent.putExtra(CIMCacheManager.KEY_CIM_SERVIER_PORT, port);
+ serviceIntent.putExtra(CIMCacheManager.KEY_CIM_SERVER_HOST, ip);
+ serviceIntent.putExtra(CIMCacheManager.KEY_CIM_SERVER_PORT, port);
serviceIntent.setAction(ACTION_CREATE_CIM_CONNECTION);
startService(serviceIntent);
@@ -83,14 +88,14 @@ public class CIMPushManager {
protected static void connect() {
boolean isManualStop = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_MANUAL_STOP);
- boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
+ boolean isManualDestroy = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
- if (isManualStop || isManualDestory) {
+ if (isManualStop || isManualDestroy) {
return;
}
- String host = CIMCacheManager.getInstance().getString(CIMCacheManager.KEY_CIM_SERVIER_HOST);
- int port = CIMCacheManager.getInstance().getInt(CIMCacheManager.KEY_CIM_SERVIER_PORT);
+ String host = CIMCacheManager.getInstance().getString(CIMCacheManager.KEY_CIM_SERVER_HOST);
+ int port = CIMCacheManager.getInstance().getInt(CIMCacheManager.KEY_CIM_SERVER_PORT);
connect(host, port);
@@ -106,7 +111,7 @@ public class CIMPushManager {
sent.put("deviceId", getDeviceId());
sent.put("channel", "java");
sent.put("device", sysPro.getProperty("os.name"));
- sent.put("version", getClientVersion());
+ sent.put("appVersion", getClientVersion());
sent.put("osVersion", sysPro.getProperty("os.version"));
sendRequest(sent);
}
@@ -119,8 +124,8 @@ public class CIMPushManager {
*/
public static void bindAccount(String account) {
- boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
- if (isManualDestory || account == null || account.trim().length() == 0) {
+ boolean isManualDestroy = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
+ if (isManualDestroy || account == null || account.trim().length() == 0) {
return;
}
sendBindRequest(account);
@@ -145,15 +150,14 @@ public class CIMPushManager {
/**
* 发送一个CIM请求
*
- * @param context
* @body
*/
public static void sendRequest(SentBody body) {
boolean isManualStop = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_MANUAL_STOP);
- boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
+ boolean isManualDestroy = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
- if (isManualStop || isManualDestory) {
+ if (isManualStop || isManualDestroy) {
return;
}
@@ -167,12 +171,11 @@ public class CIMPushManager {
/**
* 停止接受推送，将会退出当前账号登录，端口与服务端的连接
*
- * @param context
*/
public static void stop() {
- boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
- if (isManualDestory) {
+ boolean isManualDestroy = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
+ if (isManualDestroy) {
return;
}
@@ -184,29 +187,24 @@ public class CIMPushManager {
/**
* 完全销毁CIM，一般用于完全退出程序，调用resume将不能恢复
- *
- * @param context
*/
public static void destroy() {
CIMCacheManager.getInstance().putBoolean(CIMCacheManager.KEY_CIM_DESTROYED, true);
Intent serviceIntent = new Intent();
- serviceIntent.setAction(ACTION_DESTORY);
+ serviceIntent.setAction(ACTION_DESTROY);
startService(serviceIntent);
}
/**
* 重新恢复接收推送，重新连接服务端，并登录当前账号如果aotuBind == true
- *
- * @param context
- * @param aotuBind
*/
public static void resume() {
- boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
- if (isManualDestory) {
+ boolean isManualDestroy = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
+ if (isManualDestroy) {
return;
}
@@ -218,14 +216,14 @@ public class CIMPushManager {
}
public static int getState() {
- boolean isManualDestory = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
- if (isManualDestory) {
+ boolean isManualDestroy = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_CIM_DESTROYED);
+ if (isManualDestroy) {
return STATE_DESTROYED;
}
boolean isManualStop = CIMCacheManager.getInstance().getBoolean(CIMCacheManager.KEY_MANUAL_STOP);
if (isManualStop) {
- return STATE_STOPED;
+ return STATE_STOPPED;
}
return STATE_NORMAL;
@@ -250,12 +248,12 @@ public class CIMPushManager {
private static String getDeviceId() {
- String deviceId = System.getProperties().getProperty(CIMConstant.ConfigKey.CLIENT_DEVICEID);
-
- if(deviceId == null) {
- deviceId = UUID.randomUUID().toString().replaceAll("-", "").toUpperCase();
- System.getProperties().put(CIMConstant.ConfigKey.CLIENT_DEVICEID, deviceId);
+ String currDeviceId = System.getProperties().getProperty(CIMConstant.ConfigKey.CLIENT_DEVICE_ID);
+ if(currDeviceId != null) {
+ return currDeviceId;
}
+ String deviceId = UUID.randomUUID().toString().replaceAll("-", "").toUpperCase();
+ System.getProperties().put(CIMConstant.ConfigKey.CLIENT_DEVICE_ID, deviceId);
return deviceId;
}
}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMPushService.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMPushService.java
similarity index 86%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMPushService.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMPushService.java
index 2621183..b4c5e19 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/CIMPushService.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/CIMPushService.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,11 +26,9 @@ import com.farsunset.cim.sdk.client.model.SentBody;
/**
* 与服务端连接服务
- *
*/
public class CIMPushService {
- protected final static int DEF_CIM_PORT = 23456;
private CIMConnectorManager manager;
private static CIMPushService service;
@@ -48,13 +46,11 @@ public class CIMPushService {
public void onStartCommand(Intent intent) {
- intent = (intent == null ? new Intent(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE) : intent);
-
- String action = intent.getAction();
+ String action = intent == null ? CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE : intent.getAction();
if (CIMPushManager.ACTION_CREATE_CIM_CONNECTION.equals(action)) {
- String host = CIMCacheManager.getInstance().getString(CIMCacheManager.KEY_CIM_SERVIER_HOST);
- int port = CIMCacheManager.getInstance().getInt(CIMCacheManager.KEY_CIM_SERVIER_PORT);
+ String host = CIMCacheManager.getInstance().getString(CIMCacheManager.KEY_CIM_SERVER_HOST);
+ int port = CIMCacheManager.getInstance().getInt(CIMCacheManager.KEY_CIM_SERVER_PORT);
manager.connect(host, port);
}
@@ -66,14 +62,14 @@ public class CIMPushService {
manager.closeSession();
}
- if (CIMPushManager.ACTION_DESTORY.equals(action)) {
+ if (CIMPushManager.ACTION_DESTROY.equals(action)) {
manager.destroy();
}
if (CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE.equals(action) && !manager.isConnected()) {
- String host = CIMCacheManager.getInstance().getString(CIMCacheManager.KEY_CIM_SERVIER_HOST);
- int port = CIMCacheManager.getInstance().getInt(CIMCacheManager.KEY_CIM_SERVIER_PORT);
+ String host = CIMCacheManager.getInstance().getString(CIMCacheManager.KEY_CIM_SERVER_HOST);
+ int port = CIMCacheManager.getInstance().getInt(CIMCacheManager.KEY_CIM_SERVER_PORT);
manager.connect(host, port);
}
}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/coder/CIMLogger.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/CIMLogger.java
similarity index 97%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/coder/CIMLogger.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/CIMLogger.java
index 66baa18..882c942 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/coder/CIMLogger.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/CIMLogger.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -80,7 +80,7 @@ public class CIMLogger {
}
public void connectState(boolean isConnected,boolean isManualStop,boolean isDestroyed) {
- LOGGER.debug("CONNECTED:" + isConnected + " STOPED:"+isManualStop+ " DESTROYED:"+isDestroyed);
+ LOGGER.debug("CONNECTED:" + isConnected + " STOPPED:"+isManualStop+ " DESTROYED:"+isDestroyed);
}
private String getSessionInfo(SocketChannel session) {
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/coder/ClientMessageDecoder.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/ClientMessageDecoder.java
similarity index 85%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/coder/ClientMessageDecoder.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/ClientMessageDecoder.java
index 8758682..a0d1edd 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/coder/ClientMessageDecoder.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/ClientMessageDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,7 +40,7 @@ public class ClientMessageDecoder {
public Object doDecode(ByteBuffer iobuffer) {
- /**
+ /*
* 消息头3位
*/
if (iobuffer.remaining() < CIMConstant.DATA_HEADER_LENGTH) {
@@ -49,26 +49,26 @@ public class ClientMessageDecoder {
iobuffer.mark();
- byte conetnType = iobuffer.get();
+ byte type = iobuffer.get();
- byte lv = iobuffer.get();// int 低位
- byte hv = iobuffer.get();// int 高位
+ byte lv = iobuffer.get();
+ byte hv = iobuffer.get();
- int conetnLength = getContentLength(lv, hv);
+ int length = getContentLength(lv, hv);
// 如果消息体没有接收完整，则重置读取，等待下一次重新读取
- if (conetnLength > iobuffer.remaining()) {
+ if (length > iobuffer.remaining()) {
iobuffer.reset();
return null;
}
- byte[] dataBytes = new byte[conetnLength];
- iobuffer.get(dataBytes, 0, conetnLength);
+ byte[] dataBytes = new byte[length];
+ iobuffer.get(dataBytes, 0, length);
iobuffer.position(0);
try {
- return mappingMessageObject(dataBytes, conetnType);
+ return mappingMessageObject(dataBytes, type);
} catch (InvalidProtocolBufferException e) {
e.printStackTrace();
return null;
@@ -79,11 +79,10 @@ public class ClientMessageDecoder {
private Object mappingMessageObject(byte[] bytes, byte type) throws InvalidProtocolBufferException {
if (CIMConstant.ProtobufType.S_H_RQ == type) {
- HeartbeatRequest request = HeartbeatRequest.getInstance();
- return request;
+ return HeartbeatRequest.getInstance();
}
- if (CIMConstant.ProtobufType.REPLYBODY == type) {
+ if (CIMConstant.ProtobufType.REPLY_BODY == type) {
ReplyBodyProto.Model bodyProto = ReplyBodyProto.Model.parseFrom(bytes);
ReplyBody body = new ReplyBody();
body.setKey(bodyProto.getKey());
@@ -116,14 +115,12 @@ public class ClientMessageDecoder {
/**
* 解析消息体长度
*
- * @param type
- * @param length
* @return
*/
private int getContentLength(byte lv, byte hv) {
int l = (lv & 0xff);
int h = (hv & 0xff);
- return (l | (h <<= 8));
+ return (l | h << 8);
}
}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/coder/ClientMessageEncoder.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/ClientMessageEncoder.java
similarity index 90%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/coder/ClientMessageEncoder.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/ClientMessageEncoder.java
index dd1dfcc..cd90c1d 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/coder/ClientMessageEncoder.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/coder/ClientMessageEncoder.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,13 +37,13 @@ public class ClientMessageEncoder {
Protobufable data = (Protobufable) object;
byte[] byteArray = data.getByteArray();
- ByteBuffer iobuffer = ByteBuffer.allocate(byteArray.length + CIMConstant.DATA_HEADER_LENGTH);
+ ByteBuffer ioBuffer = ByteBuffer.allocate(byteArray.length + CIMConstant.DATA_HEADER_LENGTH);
- iobuffer.put(createHeader(data.getType(), byteArray.length));
- iobuffer.put(byteArray);
- iobuffer.flip();
+ ioBuffer.put(createHeader(data.getType(), byteArray.length));
+ ioBuffer.put(byteArray);
+ ioBuffer.flip();
- return iobuffer;
+ return ioBuffer;
}
diff --git a/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/constant/CIMConstant.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/constant/CIMConstant.java
new file mode 100644
index 0000000..6e2677c
--- /dev/null
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/constant/CIMConstant.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2013-2019 Xia Jun(3979434@qq.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ***************************************************************************************
+ * *
+ * Website : http://www.farsunset.com *
+ * *
+ ***************************************************************************************
+ */
+package com.farsunset.cim.sdk.client.constant;
+
+/**
+ * 常量
+ */
+public interface CIMConstant {
+
+ long RECONNECT_INTERVAL_TIME = 30 * 1000;
+ /**
+ * 消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度
+ */
+ int DATA_HEADER_LENGTH = 3;
+
+ interface ReturnCode {
+
+ String CODE_404 = "404";
+
+ String CODE_403 = "403";
+
+ String CODE_405 = "405";
+
+ String CODE_200 = "200";
+
+ String CODE_206 = "206";
+
+ String CODE_500 = "500";
+
+ }
+
+ interface ConfigKey {
+
+ String DEVICE_MODEL = "client.model";
+ String CLIENT_VERSION = "client.version";
+ String CLIENT_ACCOUNT = "client.account";
+ String CLIENT_DEVICE_ID = "client.deviceId";
+
+ }
+
+ interface ProtobufType {
+ byte C_H_RS = 0;
+ byte S_H_RQ = 1;
+ byte MESSAGE = 2;
+ byte SENT_BODY = 3;
+ byte REPLY_BODY = 4;
+ }
+
+ interface RequestKey {
+
+ String CLIENT_BIND = "client_bind";
+
+ }
+
+ interface MessageAction {
+ /*
+ 被其他设备登录挤下线消息
+ */
+ String ACTION_999 = "999";
+ }
+
+ interface IntentAction {
+
+ /*
+ 消息广播action
+ */
+ String ACTION_MESSAGE_RECEIVED = "com.farsunset.cim.ACTION_MESSAGE_RECEIVED";
+
+ /*
+ 发送sendBody成功广播
+ */
+ String ACTION_SEND_FINISHED = "com.farsunset.cim.ACTION_SEND_FINISHED";
+
+ /*
+ 链接意外关闭广播
+ */
+ String ACTION_CONNECTION_CLOSED = "com.farsunset.cim.ACTION_CONNECTION_CLOSED";
+
+ /*
+ 链接失败广播
+ */
+ String ACTION_CONNECT_FAILED = "com.farsunset.cim.ACTION_CONNECT_FAILED";
+
+ /*
+ 链接成功广播
+ */
+ String ACTION_CONNECT_FINISHED = "com.farsunset.cim.ACTION_CONNECT_FINISHED";
+
+ /*
+ 发送sendBody成功后获得replyBody回应广播
+ */
+ String ACTION_REPLY_RECEIVED = "com.farsunset.cim.ACTION_REPLY_RECEIVED";
+
+ /*
+ 重试连接
+ */
+ String ACTION_CONNECTION_RECOVERY = "com.farsunset.cim.CONNECTION_RECOVERY";
+ }
+
+}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/HeartbeatRequest.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/HeartbeatRequest.java
similarity index 99%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/HeartbeatRequest.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/HeartbeatRequest.java
index 716fb97..fbc63ab 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/HeartbeatRequest.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/HeartbeatRequest.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -50,6 +50,7 @@ public class HeartbeatRequest implements Serializable, Protobufable {
return CMD_HEARTBEAT_RESPONSE.getBytes();
}
+ @Override
public String toString() {
return TAG;
}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/HeartbeatResponse.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/HeartbeatResponse.java
similarity index 99%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/HeartbeatResponse.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/HeartbeatResponse.java
index 3f1a9da..e0a0e97 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/HeartbeatResponse.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/HeartbeatResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -49,6 +49,7 @@ public class HeartbeatResponse implements Serializable, Protobufable {
return CMD_HEARTBEAT_RESPONSE.getBytes();
}
+ @Override
public String toString() {
return TAG;
}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Intent.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Intent.java
similarity index 99%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Intent.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Intent.java
index 07c5922..f5e5830 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Intent.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Intent.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Message.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Message.java
similarity index 99%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Message.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Message.java
index 0d08017..bf6b241 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Message.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Message.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -151,6 +151,7 @@ public class Message implements Serializable {
this.extra = extra;
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer();
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Protobufable.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Protobufable.java
similarity index 99%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Protobufable.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Protobufable.java
index e47e0b9..ebac655 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/Protobufable.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/Protobufable.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/ReplyBody.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/ReplyBody.java
similarity index 91%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/ReplyBody.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/ReplyBody.java
index 5a01b53..91916af 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/ReplyBody.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/ReplyBody.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -57,7 +57,7 @@ public class ReplyBody implements Serializable {
private long timestamp;
public ReplyBody() {
- data = new HashMap();
+ data = new HashMap<>();
timestamp = System.currentTimeMillis();
}
@@ -115,20 +115,18 @@ public class ReplyBody implements Serializable {
this.code = code;
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer();
buffer.append("#ReplyBody#").append("\n");
buffer.append("key:").append(this.getKey()).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n");
buffer.append("code:").append(code).append("\n");
-
- if (!data.isEmpty()) {
- buffer.append("data{").append("\n");
- for (String key : getKeySet()) {
- buffer.append(key).append(":").append(this.get(key)).append("\n");
- }
- buffer.append("}");
+ buffer.append("data{").append("\n");
+ for (String key : getKeySet()) {
+ buffer.append(key).append(":").append(this.get(key)).append("\n");
}
+ buffer.append("}");
return buffer.toString();
}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/SentBody.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/SentBody.java
similarity index 89%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/SentBody.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/SentBody.java
index 0c53cf9..1a9091e 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/client/model/SentBody.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/client/model/SentBody.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,7 +39,7 @@ public class SentBody implements Serializable, Protobufable {
private String key;
- private HashMap data = new HashMap();;
+ private HashMap data = new HashMap<>();;
private long timestamp;
@@ -89,16 +89,13 @@ public class SentBody implements Serializable, Protobufable {
public String toString() {
StringBuffer buffer = new StringBuffer();
buffer.append("#SentBody#").append("\n");
- ;
buffer.append("key:").append(key).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n");
- if (!data.isEmpty()) {
- buffer.append("data{").append("\n");
- for (String key : getKeySet()) {
- buffer.append(key).append(":").append(this.get(key)).append("\n");
- }
- buffer.append("}");
+ buffer.append("data{").append("\n");
+ for (String key : getKeySet()) {
+ buffer.append(key).append(":").append(this.get(key)).append("\n");
}
+ buffer.append("}");
return buffer.toString();
}
@@ -115,7 +112,7 @@ public class SentBody implements Serializable, Protobufable {
@Override
public byte getType() {
- return CIMConstant.ProtobufType.SENTBODY;
+ return CIMConstant.ProtobufType.SENT_BODY;
}
}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/Message.proto b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/Message.proto
similarity index 100%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/Message.proto
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/Message.proto
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/MessageProto.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/MessageProto.java
similarity index 75%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/MessageProto.java
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/MessageProto.java
index 3cb763d..f770712 100644
--- a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/MessageProto.java
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/MessageProto.java
@@ -20,81 +20,97 @@ public final class MessageProto {
/**
* int64 id = 1;
+ * @return The id.
*/
long getId();
/**
* string action = 2;
+ * @return The action.
*/
- java.lang.String getAction();
+ String getAction();
/**
* string action = 2;
+ * @return The bytes for action.
*/
com.google.protobuf.ByteString
getActionBytes();
/**
* string content = 3;
+ * @return The content.
*/
- java.lang.String getContent();
+ String getContent();
/**
* string content = 3;
+ * @return The bytes for content.
*/
com.google.protobuf.ByteString
getContentBytes();
/**
* string sender = 4;
+ * @return The sender.
*/
- java.lang.String getSender();
+ String getSender();
/**
* string sender = 4;
+ * @return The bytes for sender.
*/
com.google.protobuf.ByteString
getSenderBytes();
/**
* string receiver = 5;
+ * @return The receiver.
*/
- java.lang.String getReceiver();
+ String getReceiver();
/**
* string receiver = 5;
+ * @return The bytes for receiver.
*/
com.google.protobuf.ByteString
getReceiverBytes();
/**
* string extra = 6;
+ * @return The extra.
*/
- java.lang.String getExtra();
+ String getExtra();
/**
* string extra = 6;
+ * @return The bytes for extra.
*/
com.google.protobuf.ByteString
getExtraBytes();
/**
* string title = 7;
+ * @return The title.
*/
- java.lang.String getTitle();
+ String getTitle();
/**
* string title = 7;
+ * @return The bytes for title.
*/
com.google.protobuf.ByteString
getTitleBytes();
/**
* string format = 8;
+ * @return The format.
*/
- java.lang.String getFormat();
+ String getFormat();
/**
* string format = 8;
+ * @return The bytes for format.
*/
com.google.protobuf.ByteString
getFormatBytes();
/**
* int64 timestamp = 9;
+ * @return The timestamp.
*/
long getTimestamp();
}
@@ -120,7 +136,14 @@ public final class MessageProto {
format_ = "";
}
- @java.lang.Override
+ @Override
+ @SuppressWarnings({"unused"})
+ protected Object newInstance(
+ UnusedPrivateParameter unused) {
+ return new Model();
+ }
+
+ @Override
public final com.google.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
@@ -131,9 +154,8 @@ public final class MessageProto {
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
- throw new java.lang.NullPointerException();
+ throw new NullPointerException();
}
- int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
try {
@@ -150,43 +172,43 @@ public final class MessageProto {
break;
}
case 18: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
action_ = s;
break;
}
case 26: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
content_ = s;
break;
}
case 34: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
sender_ = s;
break;
}
case 42: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
receiver_ = s;
break;
}
case 50: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
extra_ = s;
break;
}
case 58: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
title_ = s;
break;
}
case 66: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
format_ = s;
break;
@@ -217,53 +239,56 @@ public final class MessageProto {
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return com.farsunset.cim.sdk.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
+ return MessageProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
}
- @java.lang.Override
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ @Override
+ protected FieldAccessorTable
internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
+ return MessageProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- com.farsunset.cim.sdk.model.proto.MessageProto.Model.class, com.farsunset.cim.sdk.model.proto.MessageProto.Model.Builder.class);
+ Model.class, Builder.class);
}
public static final int ID_FIELD_NUMBER = 1;
private long id_;
/**
* int64 id = 1;
+ * @return The id.
*/
public long getId() {
return id_;
}
public static final int ACTION_FIELD_NUMBER = 2;
- private volatile java.lang.Object action_;
+ private volatile Object action_;
/**
* string action = 2;
+ * @return The action.
*/
- public java.lang.String getAction() {
- java.lang.Object ref = action_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getAction() {
+ Object ref = action_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
action_ = s;
return s;
}
}
/**
* string action = 2;
+ * @return The bytes for action.
*/
public com.google.protobuf.ByteString
getActionBytes() {
- java.lang.Object ref = action_;
- if (ref instanceof java.lang.String) {
+ Object ref = action_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
action_ = b;
return b;
} else {
@@ -272,32 +297,34 @@ public final class MessageProto {
}
public static final int CONTENT_FIELD_NUMBER = 3;
- private volatile java.lang.Object content_;
+ private volatile Object content_;
/**
* string content = 3;
+ * @return The content.
*/
- public java.lang.String getContent() {
- java.lang.Object ref = content_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getContent() {
+ Object ref = content_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
content_ = s;
return s;
}
}
/**
* string content = 3;
+ * @return The bytes for content.
*/
public com.google.protobuf.ByteString
getContentBytes() {
- java.lang.Object ref = content_;
- if (ref instanceof java.lang.String) {
+ Object ref = content_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
content_ = b;
return b;
} else {
@@ -306,32 +333,34 @@ public final class MessageProto {
}
public static final int SENDER_FIELD_NUMBER = 4;
- private volatile java.lang.Object sender_;
+ private volatile Object sender_;
/**
* string sender = 4;
+ * @return The sender.
*/
- public java.lang.String getSender() {
- java.lang.Object ref = sender_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getSender() {
+ Object ref = sender_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
sender_ = s;
return s;
}
}
/**
* string sender = 4;
+ * @return The bytes for sender.
*/
public com.google.protobuf.ByteString
getSenderBytes() {
- java.lang.Object ref = sender_;
- if (ref instanceof java.lang.String) {
+ Object ref = sender_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
sender_ = b;
return b;
} else {
@@ -340,32 +369,34 @@ public final class MessageProto {
}
public static final int RECEIVER_FIELD_NUMBER = 5;
- private volatile java.lang.Object receiver_;
+ private volatile Object receiver_;
/**
* string receiver = 5;
+ * @return The receiver.
*/
- public java.lang.String getReceiver() {
- java.lang.Object ref = receiver_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getReceiver() {
+ Object ref = receiver_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
receiver_ = s;
return s;
}
}
/**
* string receiver = 5;
+ * @return The bytes for receiver.
*/
public com.google.protobuf.ByteString
getReceiverBytes() {
- java.lang.Object ref = receiver_;
- if (ref instanceof java.lang.String) {
+ Object ref = receiver_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
receiver_ = b;
return b;
} else {
@@ -374,32 +405,34 @@ public final class MessageProto {
}
public static final int EXTRA_FIELD_NUMBER = 6;
- private volatile java.lang.Object extra_;
+ private volatile Object extra_;
/**
* string extra = 6;
+ * @return The extra.
*/
- public java.lang.String getExtra() {
- java.lang.Object ref = extra_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getExtra() {
+ Object ref = extra_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
extra_ = s;
return s;
}
}
/**
* string extra = 6;
+ * @return The bytes for extra.
*/
public com.google.protobuf.ByteString
getExtraBytes() {
- java.lang.Object ref = extra_;
- if (ref instanceof java.lang.String) {
+ Object ref = extra_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
extra_ = b;
return b;
} else {
@@ -408,32 +441,34 @@ public final class MessageProto {
}
public static final int TITLE_FIELD_NUMBER = 7;
- private volatile java.lang.Object title_;
+ private volatile Object title_;
/**
* string title = 7;
+ * @return The title.
*/
- public java.lang.String getTitle() {
- java.lang.Object ref = title_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getTitle() {
+ Object ref = title_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
title_ = s;
return s;
}
}
/**
* string title = 7;
+ * @return The bytes for title.
*/
public com.google.protobuf.ByteString
getTitleBytes() {
- java.lang.Object ref = title_;
- if (ref instanceof java.lang.String) {
+ Object ref = title_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
title_ = b;
return b;
} else {
@@ -442,32 +477,34 @@ public final class MessageProto {
}
public static final int FORMAT_FIELD_NUMBER = 8;
- private volatile java.lang.Object format_;
+ private volatile Object format_;
/**
* string format = 8;
+ * @return The format.
*/
- public java.lang.String getFormat() {
- java.lang.Object ref = format_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getFormat() {
+ Object ref = format_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
format_ = s;
return s;
}
}
/**
* string format = 8;
+ * @return The bytes for format.
*/
public com.google.protobuf.ByteString
getFormatBytes() {
- java.lang.Object ref = format_;
- if (ref instanceof java.lang.String) {
+ Object ref = format_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
format_ = b;
return b;
} else {
@@ -479,13 +516,14 @@ public final class MessageProto {
private long timestamp_;
/**
* int64 timestamp = 9;
+ * @return The timestamp.
*/
public long getTimestamp() {
return timestamp_;
}
private byte memoizedIsInitialized = -1;
- @java.lang.Override
+ @Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@@ -495,7 +533,7 @@ public final class MessageProto {
return true;
}
- @java.lang.Override
+ @Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (id_ != 0L) {
@@ -528,7 +566,7 @@ public final class MessageProto {
unknownFields.writeTo(output);
}
- @java.lang.Override
+ @Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@@ -568,15 +606,15 @@ public final class MessageProto {
return size;
}
- @java.lang.Override
- public boolean equals(final java.lang.Object obj) {
+ @Override
+ public boolean equals(final Object obj) {
if (obj == this) {
return true;
}
- if (!(obj instanceof com.farsunset.cim.sdk.model.proto.MessageProto.Model)) {
+ if (!(obj instanceof Model)) {
return super.equals(obj);
}
- com.farsunset.cim.sdk.model.proto.MessageProto.Model other = (com.farsunset.cim.sdk.model.proto.MessageProto.Model) obj;
+ Model other = (Model) obj;
if (getId()
!= other.getId()) return false;
@@ -600,7 +638,7 @@ public final class MessageProto {
return true;
}
- @java.lang.Override
+ @Override
public int hashCode() {
if (memoizedHashCode != 0) {
return memoizedHashCode;
@@ -632,69 +670,69 @@ public final class MessageProto {
return hash;
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseFrom(byte[] data)
+ public static Model parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseFrom(java.io.InputStream input)
+ public static Model parseFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input, extensionRegistry);
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseDelimitedFrom(java.io.InputStream input)
+ public static Model parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input);
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseDelimitedFrom(
+ public static Model parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input, extensionRegistry);
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -702,23 +740,23 @@ public final class MessageProto {
.parseWithIOException(PARSER, input, extensionRegistry);
}
- @java.lang.Override
+ @Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
}
- public static Builder newBuilder(com.farsunset.cim.sdk.model.proto.MessageProto.Model prototype) {
+ public static Builder newBuilder(Model prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
- @java.lang.Override
+ @Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
}
- @java.lang.Override
+ @Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -728,18 +766,18 @@ public final class MessageProto {
public static final class Builder extends
com.google.protobuf.GeneratedMessageV3.Builder implements
// @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.model.proto.Model)
- com.farsunset.cim.sdk.model.proto.MessageProto.ModelOrBuilder {
+ ModelOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return com.farsunset.cim.sdk.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
+ return MessageProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
}
- @java.lang.Override
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ @Override
+ protected FieldAccessorTable
internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
+ return MessageProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- com.farsunset.cim.sdk.model.proto.MessageProto.Model.class, com.farsunset.cim.sdk.model.proto.MessageProto.Model.Builder.class);
+ Model.class, Builder.class);
}
// Construct using com.farsunset.cim.sdk.model.proto.MessageProto.Model.newBuilder()
@@ -748,7 +786,7 @@ public final class MessageProto {
}
private Builder(
- com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@@ -757,7 +795,7 @@ public final class MessageProto {
.alwaysUseFieldBuilders) {
}
}
- @java.lang.Override
+ @Override
public Builder clear() {
super.clear();
id_ = 0L;
@@ -781,29 +819,29 @@ public final class MessageProto {
return this;
}
- @java.lang.Override
+ @Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return com.farsunset.cim.sdk.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
+ return MessageProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
}
- @java.lang.Override
- public com.farsunset.cim.sdk.model.proto.MessageProto.Model getDefaultInstanceForType() {
- return com.farsunset.cim.sdk.model.proto.MessageProto.Model.getDefaultInstance();
+ @Override
+ public Model getDefaultInstanceForType() {
+ return Model.getDefaultInstance();
}
- @java.lang.Override
- public com.farsunset.cim.sdk.model.proto.MessageProto.Model build() {
- com.farsunset.cim.sdk.model.proto.MessageProto.Model result = buildPartial();
+ @Override
+ public Model build() {
+ Model result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- @java.lang.Override
- public com.farsunset.cim.sdk.model.proto.MessageProto.Model buildPartial() {
- com.farsunset.cim.sdk.model.proto.MessageProto.Model result = new com.farsunset.cim.sdk.model.proto.MessageProto.Model(this);
+ @Override
+ public Model buildPartial() {
+ Model result = new Model(this);
result.id_ = id_;
result.action_ = action_;
result.content_ = content_;
@@ -817,50 +855,50 @@ public final class MessageProto {
return result;
}
- @java.lang.Override
+ @Override
public Builder clone() {
return super.clone();
}
- @java.lang.Override
+ @Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- java.lang.Object value) {
+ Object value) {
return super.setField(field, value);
}
- @java.lang.Override
+ @Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return super.clearField(field);
}
- @java.lang.Override
+ @Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return super.clearOneof(oneof);
}
- @java.lang.Override
+ @Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, java.lang.Object value) {
+ int index, Object value) {
return super.setRepeatedField(field, index, value);
}
- @java.lang.Override
+ @Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- java.lang.Object value) {
+ Object value) {
return super.addRepeatedField(field, value);
}
- @java.lang.Override
+ @Override
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof com.farsunset.cim.sdk.model.proto.MessageProto.Model) {
- return mergeFrom((com.farsunset.cim.sdk.model.proto.MessageProto.Model)other);
+ if (other instanceof Model) {
+ return mergeFrom((Model)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(com.farsunset.cim.sdk.model.proto.MessageProto.Model other) {
- if (other == com.farsunset.cim.sdk.model.proto.MessageProto.Model.getDefaultInstance()) return this;
+ public Builder mergeFrom(Model other) {
+ if (other == Model.getDefaultInstance()) return this;
if (other.getId() != 0L) {
setId(other.getId());
}
@@ -900,21 +938,21 @@ public final class MessageProto {
return this;
}
- @java.lang.Override
+ @Override
public final boolean isInitialized() {
return true;
}
- @java.lang.Override
+ @Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- com.farsunset.cim.sdk.model.proto.MessageProto.Model parsedMessage = null;
+ Model parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (com.farsunset.cim.sdk.model.proto.MessageProto.Model) e.getUnfinishedMessage();
+ parsedMessage = (Model) e.getUnfinishedMessage();
throw e.unwrapIOException();
} finally {
if (parsedMessage != null) {
@@ -927,12 +965,15 @@ public final class MessageProto {
private long id_ ;
/**
* int64 id = 1;
+ * @return The id.
*/
public long getId() {
return id_;
}
/**
* int64 id = 1;
+ * @param value The id to set.
+ * @return This builder for chaining.
*/
public Builder setId(long value) {
@@ -942,6 +983,7 @@ public final class MessageProto {
}
/**
* int64 id = 1;
+ * @return This builder for chaining.
*/
public Builder clearId() {
@@ -950,32 +992,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object action_ = "";
+ private Object action_ = "";
/**
* string action = 2;
+ * @return The action.
*/
- public java.lang.String getAction() {
- java.lang.Object ref = action_;
- if (!(ref instanceof java.lang.String)) {
+ public String getAction() {
+ Object ref = action_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
action_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string action = 2;
+ * @return The bytes for action.
*/
public com.google.protobuf.ByteString
getActionBytes() {
- java.lang.Object ref = action_;
+ Object ref = action_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
action_ = b;
return b;
} else {
@@ -984,9 +1028,11 @@ public final class MessageProto {
}
/**
* string action = 2;
+ * @param value The action to set.
+ * @return This builder for chaining.
*/
public Builder setAction(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -997,6 +1043,7 @@ public final class MessageProto {
}
/**
* string action = 2;
+ * @return This builder for chaining.
*/
public Builder clearAction() {
@@ -1006,6 +1053,8 @@ public final class MessageProto {
}
/**
* string action = 2;
+ * @param value The bytes for action to set.
+ * @return This builder for chaining.
*/
public Builder setActionBytes(
com.google.protobuf.ByteString value) {
@@ -1019,32 +1068,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object content_ = "";
+ private Object content_ = "";
/**
* string content = 3;
+ * @return The content.
*/
- public java.lang.String getContent() {
- java.lang.Object ref = content_;
- if (!(ref instanceof java.lang.String)) {
+ public String getContent() {
+ Object ref = content_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
content_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string content = 3;
+ * @return The bytes for content.
*/
public com.google.protobuf.ByteString
getContentBytes() {
- java.lang.Object ref = content_;
+ Object ref = content_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
content_ = b;
return b;
} else {
@@ -1053,9 +1104,11 @@ public final class MessageProto {
}
/**
* string content = 3;
+ * @param value The content to set.
+ * @return This builder for chaining.
*/
public Builder setContent(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1066,6 +1119,7 @@ public final class MessageProto {
}
/**
* string content = 3;
+ * @return This builder for chaining.
*/
public Builder clearContent() {
@@ -1075,6 +1129,8 @@ public final class MessageProto {
}
/**
* string content = 3;
+ * @param value The bytes for content to set.
+ * @return This builder for chaining.
*/
public Builder setContentBytes(
com.google.protobuf.ByteString value) {
@@ -1088,32 +1144,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object sender_ = "";
+ private Object sender_ = "";
/**
* string sender = 4;
+ * @return The sender.
*/
- public java.lang.String getSender() {
- java.lang.Object ref = sender_;
- if (!(ref instanceof java.lang.String)) {
+ public String getSender() {
+ Object ref = sender_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
sender_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string sender = 4;
+ * @return The bytes for sender.
*/
public com.google.protobuf.ByteString
getSenderBytes() {
- java.lang.Object ref = sender_;
+ Object ref = sender_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
sender_ = b;
return b;
} else {
@@ -1122,9 +1180,11 @@ public final class MessageProto {
}
/**
* string sender = 4;
+ * @param value The sender to set.
+ * @return This builder for chaining.
*/
public Builder setSender(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1135,6 +1195,7 @@ public final class MessageProto {
}
/**
* string sender = 4;
+ * @return This builder for chaining.
*/
public Builder clearSender() {
@@ -1144,6 +1205,8 @@ public final class MessageProto {
}
/**
* string sender = 4;
+ * @param value The bytes for sender to set.
+ * @return This builder for chaining.
*/
public Builder setSenderBytes(
com.google.protobuf.ByteString value) {
@@ -1157,32 +1220,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object receiver_ = "";
+ private Object receiver_ = "";
/**
* string receiver = 5;
+ * @return The receiver.
*/
- public java.lang.String getReceiver() {
- java.lang.Object ref = receiver_;
- if (!(ref instanceof java.lang.String)) {
+ public String getReceiver() {
+ Object ref = receiver_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
receiver_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string receiver = 5;
+ * @return The bytes for receiver.
*/
public com.google.protobuf.ByteString
getReceiverBytes() {
- java.lang.Object ref = receiver_;
+ Object ref = receiver_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
receiver_ = b;
return b;
} else {
@@ -1191,9 +1256,11 @@ public final class MessageProto {
}
/**
* string receiver = 5;
+ * @param value The receiver to set.
+ * @return This builder for chaining.
*/
public Builder setReceiver(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1204,6 +1271,7 @@ public final class MessageProto {
}
/**
* string receiver = 5;
+ * @return This builder for chaining.
*/
public Builder clearReceiver() {
@@ -1213,6 +1281,8 @@ public final class MessageProto {
}
/**
* string receiver = 5;
+ * @param value The bytes for receiver to set.
+ * @return This builder for chaining.
*/
public Builder setReceiverBytes(
com.google.protobuf.ByteString value) {
@@ -1226,32 +1296,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object extra_ = "";
+ private Object extra_ = "";
/**
* string extra = 6;
+ * @return The extra.
*/
- public java.lang.String getExtra() {
- java.lang.Object ref = extra_;
- if (!(ref instanceof java.lang.String)) {
+ public String getExtra() {
+ Object ref = extra_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
extra_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string extra = 6;
+ * @return The bytes for extra.
*/
public com.google.protobuf.ByteString
getExtraBytes() {
- java.lang.Object ref = extra_;
+ Object ref = extra_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
extra_ = b;
return b;
} else {
@@ -1260,9 +1332,11 @@ public final class MessageProto {
}
/**
* string extra = 6;
+ * @param value The extra to set.
+ * @return This builder for chaining.
*/
public Builder setExtra(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1273,6 +1347,7 @@ public final class MessageProto {
}
/**
* string extra = 6;
+ * @return This builder for chaining.
*/
public Builder clearExtra() {
@@ -1282,6 +1357,8 @@ public final class MessageProto {
}
/**
* string extra = 6;
+ * @param value The bytes for extra to set.
+ * @return This builder for chaining.
*/
public Builder setExtraBytes(
com.google.protobuf.ByteString value) {
@@ -1295,32 +1372,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object title_ = "";
+ private Object title_ = "";
/**
* string title = 7;
+ * @return The title.
*/
- public java.lang.String getTitle() {
- java.lang.Object ref = title_;
- if (!(ref instanceof java.lang.String)) {
+ public String getTitle() {
+ Object ref = title_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
title_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string title = 7;
+ * @return The bytes for title.
*/
public com.google.protobuf.ByteString
getTitleBytes() {
- java.lang.Object ref = title_;
+ Object ref = title_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
title_ = b;
return b;
} else {
@@ -1329,9 +1408,11 @@ public final class MessageProto {
}
/**
* string title = 7;
+ * @param value The title to set.
+ * @return This builder for chaining.
*/
public Builder setTitle(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1342,6 +1423,7 @@ public final class MessageProto {
}
/**
* string title = 7;
+ * @return This builder for chaining.
*/
public Builder clearTitle() {
@@ -1351,6 +1433,8 @@ public final class MessageProto {
}
/**
* string title = 7;
+ * @param value The bytes for title to set.
+ * @return This builder for chaining.
*/
public Builder setTitleBytes(
com.google.protobuf.ByteString value) {
@@ -1364,32 +1448,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object format_ = "";
+ private Object format_ = "";
/**
* string format = 8;
+ * @return The format.
*/
- public java.lang.String getFormat() {
- java.lang.Object ref = format_;
- if (!(ref instanceof java.lang.String)) {
+ public String getFormat() {
+ Object ref = format_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
format_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string format = 8;
+ * @return The bytes for format.
*/
public com.google.protobuf.ByteString
getFormatBytes() {
- java.lang.Object ref = format_;
+ Object ref = format_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
format_ = b;
return b;
} else {
@@ -1398,9 +1484,11 @@ public final class MessageProto {
}
/**
* string format = 8;
+ * @param value The format to set.
+ * @return This builder for chaining.
*/
public Builder setFormat(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1411,6 +1499,7 @@ public final class MessageProto {
}
/**
* string format = 8;
+ * @return This builder for chaining.
*/
public Builder clearFormat() {
@@ -1420,6 +1509,8 @@ public final class MessageProto {
}
/**
* string format = 8;
+ * @param value The bytes for format to set.
+ * @return This builder for chaining.
*/
public Builder setFormatBytes(
com.google.protobuf.ByteString value) {
@@ -1436,12 +1527,15 @@ public final class MessageProto {
private long timestamp_ ;
/**
* int64 timestamp = 9;
+ * @return The timestamp.
*/
public long getTimestamp() {
return timestamp_;
}
/**
* int64 timestamp = 9;
+ * @param value The timestamp to set.
+ * @return This builder for chaining.
*/
public Builder setTimestamp(long value) {
@@ -1451,6 +1545,7 @@ public final class MessageProto {
}
/**
* int64 timestamp = 9;
+ * @return This builder for chaining.
*/
public Builder clearTimestamp() {
@@ -1458,13 +1553,13 @@ public final class MessageProto {
onChanged();
return this;
}
- @java.lang.Override
+ @Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
- @java.lang.Override
+ @Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@@ -1475,18 +1570,18 @@ public final class MessageProto {
}
// @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.model.proto.Model)
- private static final com.farsunset.cim.sdk.model.proto.MessageProto.Model DEFAULT_INSTANCE;
+ private static final Model DEFAULT_INSTANCE;
static {
- DEFAULT_INSTANCE = new com.farsunset.cim.sdk.model.proto.MessageProto.Model();
+ DEFAULT_INSTANCE = new Model();
}
- public static com.farsunset.cim.sdk.model.proto.MessageProto.Model getDefaultInstance() {
+ public static Model getDefaultInstance() {
return DEFAULT_INSTANCE;
}
private static final com.google.protobuf.Parser
PARSER = new com.google.protobuf.AbstractParser() {
- @java.lang.Override
+ @Override
public Model parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1499,13 +1594,13 @@ public final class MessageProto {
return PARSER;
}
- @java.lang.Override
+ @Override
public com.google.protobuf.Parser getParserForType() {
return PARSER;
}
- @java.lang.Override
- public com.farsunset.cim.sdk.model.proto.MessageProto.Model getDefaultInstanceForType() {
+ @Override
+ public Model getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@@ -1524,7 +1619,7 @@ public final class MessageProto {
private static com.google.protobuf.Descriptors.FileDescriptor
descriptor;
static {
- java.lang.String[] descriptorData = {
+ String[] descriptorData = {
"\n\rMessage.proto\022!com.farsunset.cim.sdk.m" +
"odel.proto\"\227\001\n\005Model\022\n\n\002id\030\001 \001(\003\022\016\n\006acti" +
"on\030\002 \001(\t\022\017\n\007content\030\003 \001(\t\022\016\n\006sender\030\004 \001(" +
@@ -1532,24 +1627,16 @@ public final class MessageProto {
"tle\030\007 \001(\t\022\016\n\006format\030\010 \001(\t\022\021\n\ttimestamp\030\t" +
" \001(\003B\016B\014MessageProtob\006proto3"
};
- com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- return null;
- }
- };
- com.google.protobuf.Descriptors.FileDescriptor
+ descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
- }, assigner);
+ });
internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor =
getDescriptor().getMessageTypes().get(0);
internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor,
- new java.lang.String[] { "Id", "Action", "Content", "Sender", "Receiver", "Extra", "Title", "Format", "Timestamp", });
+ new String[] { "Id", "Action", "Content", "Sender", "Receiver", "Extra", "Title", "Format", "Timestamp", });
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/ReplyBody.proto b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/ReplyBody.proto
similarity index 100%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/ReplyBody.proto
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/ReplyBody.proto
diff --git a/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/ReplyBodyProto.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/ReplyBodyProto.java
new file mode 100644
index 0000000..55a38bb
--- /dev/null
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/ReplyBodyProto.java
@@ -0,0 +1,1304 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: ReplyBody.proto
+
+package com.farsunset.cim.sdk.model.proto;
+
+public final class ReplyBodyProto {
+ private ReplyBodyProto() {}
+ public static void registerAllExtensions(
+ com.google.protobuf.ExtensionRegistryLite registry) {
+ }
+
+ public static void registerAllExtensions(
+ com.google.protobuf.ExtensionRegistry registry) {
+ registerAllExtensions(
+ (com.google.protobuf.ExtensionRegistryLite) registry);
+ }
+ public interface ModelOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:com.farsunset.cim.sdk.model.proto.Model)
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ * string key = 1;
+ * @return The key.
+ */
+ String getKey();
+ /**
+ * string key = 1;
+ * @return The bytes for key.
+ */
+ com.google.protobuf.ByteString
+ getKeyBytes();
+
+ /**
+ * string code = 2;
+ * @return The code.
+ */
+ String getCode();
+ /**
+ * string code = 2;
+ * @return The bytes for code.
+ */
+ com.google.protobuf.ByteString
+ getCodeBytes();
+
+ /**
+ * string message = 3;
+ * @return The message.
+ */
+ String getMessage();
+ /**
+ * string message = 3;
+ * @return The bytes for message.
+ */
+ com.google.protobuf.ByteString
+ getMessageBytes();
+
+ /**
+ * int64 timestamp = 4;
+ * @return The timestamp.
+ */
+ long getTimestamp();
+
+ /**
+ * map<string, string> data = 5;
+ */
+ int getDataCount();
+ /**
+ * map<string, string> data = 5;
+ */
+ boolean containsData(
+ String key);
+ /**
+ * Use {@link #getDataMap()} instead.
+ */
+ @Deprecated
+ java.util.Map
+ getData();
+ /**
+ * map<string, string> data = 5;
+ */
+ java.util.Map
+ getDataMap();
+ /**
+ * map<string, string> data = 5;
+ */
+
+ String getDataOrDefault(
+ String key,
+ String defaultValue);
+ /**
+ * map<string, string> data = 5;
+ */
+
+ String getDataOrThrow(
+ String key);
+ }
+ /**
+ * Protobuf type {@code com.farsunset.cim.sdk.model.proto.Model}
+ */
+ public static final class Model extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:com.farsunset.cim.sdk.model.proto.Model)
+ ModelOrBuilder {
+ private static final long serialVersionUID = 0L;
+ // Use Model.newBuilder() to construct.
+ private Model(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+ private Model() {
+ key_ = "";
+ code_ = "";
+ message_ = "";
+ }
+
+ @Override
+ @SuppressWarnings({"unused"})
+ protected Object newInstance(
+ UnusedPrivateParameter unused) {
+ return new Model();
+ }
+
+ @Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private Model(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ this();
+ if (extensionRegistry == null) {
+ throw new NullPointerException();
+ }
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 10: {
+ String s = input.readStringRequireUtf8();
+
+ key_ = s;
+ break;
+ }
+ case 18: {
+ String s = input.readStringRequireUtf8();
+
+ code_ = s;
+ break;
+ }
+ case 26: {
+ String s = input.readStringRequireUtf8();
+
+ message_ = s;
+ break;
+ }
+ case 32: {
+
+ timestamp_ = input.readInt64();
+ break;
+ }
+ case 42: {
+ if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+ data_ = com.google.protobuf.MapField.newMapField(
+ DataDefaultEntryHolder.defaultEntry);
+ mutable_bitField0_ |= 0x00000001;
+ }
+ com.google.protobuf.MapEntry
+ data__ = input.readMessage(
+ DataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+ data_.getMutableMap().put(
+ data__.getKey(), data__.getValue());
+ break;
+ }
+ default: {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
+ }
+
+ @SuppressWarnings({"rawtypes"})
+ @Override
+ protected com.google.protobuf.MapField internalGetMapField(
+ int number) {
+ switch (number) {
+ case 5:
+ return internalGetData();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @Override
+ protected FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ Model.class, Builder.class);
+ }
+
+ public static final int KEY_FIELD_NUMBER = 1;
+ private volatile Object key_;
+ /**
+ * string key = 1;
+ * @return The key.
+ */
+ public String getKey() {
+ Object ref = key_;
+ if (ref instanceof String) {
+ return (String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ String s = bs.toStringUtf8();
+ key_ = s;
+ return s;
+ }
+ }
+ /**
+ * string key = 1;
+ * @return The bytes for key.
+ */
+ public com.google.protobuf.ByteString
+ getKeyBytes() {
+ Object ref = key_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (String) ref);
+ key_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int CODE_FIELD_NUMBER = 2;
+ private volatile Object code_;
+ /**
+ * string code = 2;
+ * @return The code.
+ */
+ public String getCode() {
+ Object ref = code_;
+ if (ref instanceof String) {
+ return (String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ String s = bs.toStringUtf8();
+ code_ = s;
+ return s;
+ }
+ }
+ /**
+ * string code = 2;
+ * @return The bytes for code.
+ */
+ public com.google.protobuf.ByteString
+ getCodeBytes() {
+ Object ref = code_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (String) ref);
+ code_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int MESSAGE_FIELD_NUMBER = 3;
+ private volatile Object message_;
+ /**
+ * string message = 3;
+ * @return The message.
+ */
+ public String getMessage() {
+ Object ref = message_;
+ if (ref instanceof String) {
+ return (String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ String s = bs.toStringUtf8();
+ message_ = s;
+ return s;
+ }
+ }
+ /**
+ * string message = 3;
+ * @return The bytes for message.
+ */
+ public com.google.protobuf.ByteString
+ getMessageBytes() {
+ Object ref = message_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (String) ref);
+ message_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int TIMESTAMP_FIELD_NUMBER = 4;
+ private long timestamp_;
+ /**
+ * int64 timestamp = 4;
+ * @return The timestamp.
+ */
+ public long getTimestamp() {
+ return timestamp_;
+ }
+
+ public static final int DATA_FIELD_NUMBER = 5;
+ private static final class DataDefaultEntryHolder {
+ static final com.google.protobuf.MapEntry<
+ String, String> defaultEntry =
+ com.google.protobuf.MapEntry
+ .newDefaultInstance(
+ ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor,
+ com.google.protobuf.WireFormat.FieldType.STRING,
+ "",
+ com.google.protobuf.WireFormat.FieldType.STRING,
+ "");
+ }
+ private com.google.protobuf.MapField<
+ String, String> data_;
+ private com.google.protobuf.MapField
+ internalGetData() {
+ if (data_ == null) {
+ return com.google.protobuf.MapField.emptyMapField(
+ DataDefaultEntryHolder.defaultEntry);
+ }
+ return data_;
+ }
+
+ public int getDataCount() {
+ return internalGetData().getMap().size();
+ }
+ /**
+ * map<string, string> data = 5;
+ */
+
+ public boolean containsData(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ return internalGetData().getMap().containsKey(key);
+ }
+ /**
+ * Use {@link #getDataMap()} instead.
+ */
+ @Deprecated
+ public java.util.Map getData() {
+ return getDataMap();
+ }
+ /**
+ * map<string, string> data = 5;
+ */
+
+ public java.util.Map getDataMap() {
+ return internalGetData().getMap();
+ }
+ /**
+ * map<string, string> data = 5;
+ */
+
+ public String getDataOrDefault(
+ String key,
+ String defaultValue) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
+ internalGetData().getMap();
+ return map.containsKey(key) ? map.get(key) : defaultValue;
+ }
+ /**
+ * map<string, string> data = 5;
+ */
+
+ public String getDataOrThrow(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
+ internalGetData().getMap();
+ if (!map.containsKey(key)) {
+ throw new IllegalArgumentException();
+ }
+ return map.get(key);
+ }
+
+ private byte memoizedIsInitialized = -1;
+ @Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ if (!getKeyBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, key_);
+ }
+ if (!getCodeBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 2, code_);
+ }
+ if (!getMessageBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 3, message_);
+ }
+ if (timestamp_ != 0L) {
+ output.writeInt64(4, timestamp_);
+ }
+ com.google.protobuf.GeneratedMessageV3
+ .serializeStringMapTo(
+ output,
+ internalGetData(),
+ DataDefaultEntryHolder.defaultEntry,
+ 5);
+ unknownFields.writeTo(output);
+ }
+
+ @Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (!getKeyBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, key_);
+ }
+ if (!getCodeBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, code_);
+ }
+ if (!getMessageBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, message_);
+ }
+ if (timestamp_ != 0L) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt64Size(4, timestamp_);
+ }
+ for (java.util.Map.Entry entry
+ : internalGetData().getMap().entrySet()) {
+ com.google.protobuf.MapEntry
+ data__ = DataDefaultEntryHolder.defaultEntry.newBuilderForType()
+ .setKey(entry.getKey())
+ .setValue(entry.getValue())
+ .build();
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(5, data__);
+ }
+ size += unknownFields.getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof Model)) {
+ return super.equals(obj);
+ }
+ Model other = (Model) obj;
+
+ if (!getKey()
+ .equals(other.getKey())) return false;
+ if (!getCode()
+ .equals(other.getCode())) return false;
+ if (!getMessage()
+ .equals(other.getMessage())) return false;
+ if (getTimestamp()
+ != other.getTimestamp()) return false;
+ if (!internalGetData().equals(
+ other.internalGetData())) return false;
+ if (!unknownFields.equals(other.unknownFields)) return false;
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ hash = (37 * hash) + KEY_FIELD_NUMBER;
+ hash = (53 * hash) + getKey().hashCode();
+ hash = (37 * hash) + CODE_FIELD_NUMBER;
+ hash = (53 * hash) + getCode().hashCode();
+ hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
+ hash = (53 * hash) + getMessage().hashCode();
+ hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+ getTimestamp());
+ if (!internalGetData().getMap().isEmpty()) {
+ hash = (37 * hash) + DATA_FIELD_NUMBER;
+ hash = (53 * hash) + internalGetData().hashCode();
+ }
+ hash = (29 * hash) + unknownFields.hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static Model parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static Model parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static Model parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static Model parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static Model parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static Model parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static Model parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static Model parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static Model parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+ public static Model parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static Model parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static Model parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ @Override
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(Model prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ @Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE
+ ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @Override
+ protected Builder newBuilderForType(
+ BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * Protobuf type {@code com.farsunset.cim.sdk.model.proto.Model}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageV3.Builder implements
+ // @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.model.proto.Model)
+ ModelOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
+ }
+
+ @SuppressWarnings({"rawtypes"})
+ protected com.google.protobuf.MapField internalGetMapField(
+ int number) {
+ switch (number) {
+ case 5:
+ return internalGetData();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @SuppressWarnings({"rawtypes"})
+ protected com.google.protobuf.MapField internalGetMutableMapField(
+ int number) {
+ switch (number) {
+ case 5:
+ return internalGetMutableData();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @Override
+ protected FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ Model.class, Builder.class);
+ }
+
+ // Construct using com.farsunset.cim.sdk.model.proto.ReplyBodyProto.Model.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3
+ .alwaysUseFieldBuilders) {
+ }
+ }
+ @Override
+ public Builder clear() {
+ super.clear();
+ key_ = "";
+
+ code_ = "";
+
+ message_ = "";
+
+ timestamp_ = 0L;
+
+ internalGetMutableData().clear();
+ return this;
+ }
+
+ @Override
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return ReplyBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
+ }
+
+ @Override
+ public Model getDefaultInstanceForType() {
+ return Model.getDefaultInstance();
+ }
+
+ @Override
+ public Model build() {
+ Model result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ @Override
+ public Model buildPartial() {
+ Model result = new Model(this);
+ int from_bitField0_ = bitField0_;
+ result.key_ = key_;
+ result.code_ = code_;
+ result.message_ = message_;
+ result.timestamp_ = timestamp_;
+ result.data_ = internalGetData();
+ result.data_.makeImmutable();
+ onBuilt();
+ return result;
+ }
+
+ @Override
+ public Builder clone() {
+ return super.clone();
+ }
+ @Override
+ public Builder setField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ Object value) {
+ return super.setField(field, value);
+ }
+ @Override
+ public Builder clearField(
+ com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return super.clearField(field);
+ }
+ @Override
+ public Builder clearOneof(
+ com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return super.clearOneof(oneof);
+ }
+ @Override
+ public Builder setRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ int index, Object value) {
+ return super.setRepeatedField(field, index, value);
+ }
+ @Override
+ public Builder addRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ Object value) {
+ return super.addRepeatedField(field, value);
+ }
+ @Override
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof Model) {
+ return mergeFrom((Model)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(Model other) {
+ if (other == Model.getDefaultInstance()) return this;
+ if (!other.getKey().isEmpty()) {
+ key_ = other.key_;
+ onChanged();
+ }
+ if (!other.getCode().isEmpty()) {
+ code_ = other.code_;
+ onChanged();
+ }
+ if (!other.getMessage().isEmpty()) {
+ message_ = other.message_;
+ onChanged();
+ }
+ if (other.getTimestamp() != 0L) {
+ setTimestamp(other.getTimestamp());
+ }
+ internalGetMutableData().mergeFrom(
+ other.internalGetData());
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
+ return this;
+ }
+
+ @Override
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ @Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ Model parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (Model) e.getUnfinishedMessage();
+ throw e.unwrapIOException();
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+ private int bitField0_;
+
+ private Object key_ = "";
+ /**
+ * string key = 1;
+ * @return The key.
+ */
+ public String getKey() {
+ Object ref = key_;
+ if (!(ref instanceof String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ String s = bs.toStringUtf8();
+ key_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
+ }
+ /**
+ * string key = 1;
+ * @return The bytes for key.
+ */
+ public com.google.protobuf.ByteString
+ getKeyBytes() {
+ Object ref = key_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (String) ref);
+ key_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string key = 1;
+ * @param value The key to set.
+ * @return This builder for chaining.
+ */
+ public Builder setKey(
+ String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ key_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string key = 1;
+ * @return This builder for chaining.
+ */
+ public Builder clearKey() {
+
+ key_ = getDefaultInstance().getKey();
+ onChanged();
+ return this;
+ }
+ /**
+ * string key = 1;
+ * @param value The bytes for key to set.
+ * @return This builder for chaining.
+ */
+ public Builder setKeyBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ key_ = value;
+ onChanged();
+ return this;
+ }
+
+ private Object code_ = "";
+ /**
+ * string code = 2;
+ * @return The code.
+ */
+ public String getCode() {
+ Object ref = code_;
+ if (!(ref instanceof String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ String s = bs.toStringUtf8();
+ code_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
+ }
+ /**
+ * string code = 2;
+ * @return The bytes for code.
+ */
+ public com.google.protobuf.ByteString
+ getCodeBytes() {
+ Object ref = code_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (String) ref);
+ code_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string code = 2;
+ * @param value The code to set.
+ * @return This builder for chaining.
+ */
+ public Builder setCode(
+ String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ code_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string code = 2;
+ * @return This builder for chaining.
+ */
+ public Builder clearCode() {
+
+ code_ = getDefaultInstance().getCode();
+ onChanged();
+ return this;
+ }
+ /**
+ * string code = 2;
+ * @param value The bytes for code to set.
+ * @return This builder for chaining.
+ */
+ public Builder setCodeBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ code_ = value;
+ onChanged();
+ return this;
+ }
+
+ private Object message_ = "";
+ /**
+ * string message = 3;
+ * @return The message.
+ */
+ public String getMessage() {
+ Object ref = message_;
+ if (!(ref instanceof String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ String s = bs.toStringUtf8();
+ message_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
+ }
+ /**
+ * string message = 3;
+ * @return The bytes for message.
+ */
+ public com.google.protobuf.ByteString
+ getMessageBytes() {
+ Object ref = message_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (String) ref);
+ message_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string message = 3;
+ * @param value The message to set.
+ * @return This builder for chaining.
+ */
+ public Builder setMessage(
+ String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ message_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string message = 3;
+ * @return This builder for chaining.
+ */
+ public Builder clearMessage() {
+
+ message_ = getDefaultInstance().getMessage();
+ onChanged();
+ return this;
+ }
+ /**
+ * string message = 3;
+ * @param value The bytes for message to set.
+ * @return This builder for chaining.
+ */
+ public Builder setMessageBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ message_ = value;
+ onChanged();
+ return this;
+ }
+
+ private long timestamp_ ;
+ /**
+ * int64 timestamp = 4;
+ * @return The timestamp.
+ */
+ public long getTimestamp() {
+ return timestamp_;
+ }
+ /**
+ * int64 timestamp = 4;
+ * @param value The timestamp to set.
+ * @return This builder for chaining.
+ */
+ public Builder setTimestamp(long value) {
+
+ timestamp_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * int64 timestamp = 4;
+ * @return This builder for chaining.
+ */
+ public Builder clearTimestamp() {
+
+ timestamp_ = 0L;
+ onChanged();
+ return this;
+ }
+
+ private com.google.protobuf.MapField<
+ String, String> data_;
+ private com.google.protobuf.MapField
+ internalGetData() {
+ if (data_ == null) {
+ return com.google.protobuf.MapField.emptyMapField(
+ DataDefaultEntryHolder.defaultEntry);
+ }
+ return data_;
+ }
+ private com.google.protobuf.MapField
+ internalGetMutableData() {
+ onChanged();;
+ if (data_ == null) {
+ data_ = com.google.protobuf.MapField.newMapField(
+ DataDefaultEntryHolder.defaultEntry);
+ }
+ if (!data_.isMutable()) {
+ data_ = data_.copy();
+ }
+ return data_;
+ }
+
+ public int getDataCount() {
+ return internalGetData().getMap().size();
+ }
+ /**
+ * map<string, string> data = 5;
+ */
+
+ public boolean containsData(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ return internalGetData().getMap().containsKey(key);
+ }
+ /**
+ * Use {@link #getDataMap()} instead.
+ */
+ @Deprecated
+ public java.util.Map getData() {
+ return getDataMap();
+ }
+ /**
+ * map<string, string> data = 5;
+ */
+
+ public java.util.Map getDataMap() {
+ return internalGetData().getMap();
+ }
+ /**
+ * map<string, string> data = 5;
+ */
+
+ public String getDataOrDefault(
+ String key,
+ String defaultValue) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
+ internalGetData().getMap();
+ return map.containsKey(key) ? map.get(key) : defaultValue;
+ }
+ /**
+ * map<string, string> data = 5;
+ */
+
+ public String getDataOrThrow(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
+ internalGetData().getMap();
+ if (!map.containsKey(key)) {
+ throw new IllegalArgumentException();
+ }
+ return map.get(key);
+ }
+
+ public Builder clearData() {
+ internalGetMutableData().getMutableMap()
+ .clear();
+ return this;
+ }
+ /**
+ * map<string, string> data = 5;
+ */
+
+ public Builder removeData(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ internalGetMutableData().getMutableMap()
+ .remove(key);
+ return this;
+ }
+ /**
+ * Use alternate mutation accessors instead.
+ */
+ @Deprecated
+ public java.util.Map
+ getMutableData() {
+ return internalGetMutableData().getMutableMap();
+ }
+ /**
+ * map<string, string> data = 5;
+ */
+ public Builder putData(
+ String key,
+ String value) {
+ if (key == null) { throw new NullPointerException(); }
+ if (value == null) { throw new NullPointerException(); }
+ internalGetMutableData().getMutableMap()
+ .put(key, value);
+ return this;
+ }
+ /**
+ * map<string, string> data = 5;
+ */
+
+ public Builder putAllData(
+ java.util.Map values) {
+ internalGetMutableData().getMutableMap()
+ .putAll(values);
+ return this;
+ }
+ @Override
+ public final Builder setUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFields(unknownFields);
+ }
+
+ @Override
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+
+ // @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.model.proto.Model)
+ }
+
+ // @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.model.proto.Model)
+ private static final Model DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new Model();
+ }
+
+ public static Model getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ @Override
+ public Model parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new Model(input, extensionRegistry);
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ @Override
+ public Model getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+ }
+
+ private static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
+ private static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable;
+ private static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor;
+ private static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_fieldAccessorTable;
+
+ public static com.google.protobuf.Descriptors.FileDescriptor
+ getDescriptor() {
+ return descriptor;
+ }
+ private static com.google.protobuf.Descriptors.FileDescriptor
+ descriptor;
+ static {
+ String[] descriptorData = {
+ "\n\017ReplyBody.proto\022!com.farsunset.cim.sdk" +
+ ".model.proto\"\265\001\n\005Model\022\013\n\003key\030\001 \001(\t\022\014\n\004c" +
+ "ode\030\002 \001(\t\022\017\n\007message\030\003 \001(\t\022\021\n\ttimestamp\030" +
+ "\004 \001(\003\022@\n\004data\030\005 \003(\01322.com.farsunset.cim." +
+ "sdk.model.proto.Model.DataEntry\032+\n\tDataE" +
+ "ntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\020B\016" +
+ "ReplyBodyProtob\006proto3"
+ };
+ descriptor = com.google.protobuf.Descriptors.FileDescriptor
+ .internalBuildGeneratedFileFrom(descriptorData,
+ new com.google.protobuf.Descriptors.FileDescriptor[] {
+ });
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor,
+ new String[] { "Key", "Code", "Message", "Timestamp", "Data", });
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor =
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor.getNestedTypes().get(0);
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor,
+ new String[] { "Key", "Value", });
+ }
+
+ // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/SentBody.proto b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/SentBody.proto
similarity index 100%
rename from cim-client-sdk/cim-java-sdk/src/com/farsunset/cim/sdk/model/proto/SentBody.proto
rename to cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/SentBody.proto
diff --git a/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/SentBodyProto.java b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/SentBodyProto.java
new file mode 100644
index 0000000..ffc32db
--- /dev/null
+++ b/cim-client-sdk/cim-java-sdk/src/main/java/com/farsunset/cim/sdk/model/proto/SentBodyProto.java
@@ -0,0 +1,1007 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: SentBody.proto
+
+package com.farsunset.cim.sdk.model.proto;
+
+public final class SentBodyProto {
+ private SentBodyProto() {}
+ public static void registerAllExtensions(
+ com.google.protobuf.ExtensionRegistryLite registry) {
+ }
+
+ public static void registerAllExtensions(
+ com.google.protobuf.ExtensionRegistry registry) {
+ registerAllExtensions(
+ (com.google.protobuf.ExtensionRegistryLite) registry);
+ }
+ public interface ModelOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:com.farsunset.cim.sdk.model.proto.Model)
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ * string key = 1;
+ * @return The key.
+ */
+ String getKey();
+ /**
+ * string key = 1;
+ * @return The bytes for key.
+ */
+ com.google.protobuf.ByteString
+ getKeyBytes();
+
+ /**
+ * int64 timestamp = 2;
+ * @return The timestamp.
+ */
+ long getTimestamp();
+
+ /**
+ * map<string, string> data = 3;
+ */
+ int getDataCount();
+ /**
+ * map<string, string> data = 3;
+ */
+ boolean containsData(
+ String key);
+ /**
+ * Use {@link #getDataMap()} instead.
+ */
+ @Deprecated
+ java.util.Map
+ getData();
+ /**
+ * map<string, string> data = 3;
+ */
+ java.util.Map
+ getDataMap();
+ /**
+ * map<string, string> data = 3;
+ */
+
+ String getDataOrDefault(
+ String key,
+ String defaultValue);
+ /**
+ * map<string, string> data = 3;
+ */
+
+ String getDataOrThrow(
+ String key);
+ }
+ /**
+ * Protobuf type {@code com.farsunset.cim.sdk.model.proto.Model}
+ */
+ public static final class Model extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:com.farsunset.cim.sdk.model.proto.Model)
+ ModelOrBuilder {
+ private static final long serialVersionUID = 0L;
+ // Use Model.newBuilder() to construct.
+ private Model(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+ private Model() {
+ key_ = "";
+ }
+
+ @Override
+ @SuppressWarnings({"unused"})
+ protected Object newInstance(
+ UnusedPrivateParameter unused) {
+ return new Model();
+ }
+
+ @Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private Model(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ this();
+ if (extensionRegistry == null) {
+ throw new NullPointerException();
+ }
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 10: {
+ String s = input.readStringRequireUtf8();
+
+ key_ = s;
+ break;
+ }
+ case 16: {
+
+ timestamp_ = input.readInt64();
+ break;
+ }
+ case 26: {
+ if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+ data_ = com.google.protobuf.MapField.newMapField(
+ DataDefaultEntryHolder.defaultEntry);
+ mutable_bitField0_ |= 0x00000001;
+ }
+ com.google.protobuf.MapEntry
+ data__ = input.readMessage(
+ DataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+ data_.getMutableMap().put(
+ data__.getKey(), data__.getValue());
+ break;
+ }
+ default: {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
+ }
+
+ @SuppressWarnings({"rawtypes"})
+ @Override
+ protected com.google.protobuf.MapField internalGetMapField(
+ int number) {
+ switch (number) {
+ case 3:
+ return internalGetData();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @Override
+ protected FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ Model.class, Builder.class);
+ }
+
+ public static final int KEY_FIELD_NUMBER = 1;
+ private volatile Object key_;
+ /**
+ * string key = 1;
+ * @return The key.
+ */
+ public String getKey() {
+ Object ref = key_;
+ if (ref instanceof String) {
+ return (String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ String s = bs.toStringUtf8();
+ key_ = s;
+ return s;
+ }
+ }
+ /**
+ * string key = 1;
+ * @return The bytes for key.
+ */
+ public com.google.protobuf.ByteString
+ getKeyBytes() {
+ Object ref = key_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (String) ref);
+ key_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int TIMESTAMP_FIELD_NUMBER = 2;
+ private long timestamp_;
+ /**
+ * int64 timestamp = 2;
+ * @return The timestamp.
+ */
+ public long getTimestamp() {
+ return timestamp_;
+ }
+
+ public static final int DATA_FIELD_NUMBER = 3;
+ private static final class DataDefaultEntryHolder {
+ static final com.google.protobuf.MapEntry<
+ String, String> defaultEntry =
+ com.google.protobuf.MapEntry
+ .newDefaultInstance(
+ SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor,
+ com.google.protobuf.WireFormat.FieldType.STRING,
+ "",
+ com.google.protobuf.WireFormat.FieldType.STRING,
+ "");
+ }
+ private com.google.protobuf.MapField<
+ String, String> data_;
+ private com.google.protobuf.MapField
+ internalGetData() {
+ if (data_ == null) {
+ return com.google.protobuf.MapField.emptyMapField(
+ DataDefaultEntryHolder.defaultEntry);
+ }
+ return data_;
+ }
+
+ public int getDataCount() {
+ return internalGetData().getMap().size();
+ }
+ /**
+ * map<string, string> data = 3;
+ */
+
+ public boolean containsData(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ return internalGetData().getMap().containsKey(key);
+ }
+ /**
+ * Use {@link #getDataMap()} instead.
+ */
+ @Deprecated
+ public java.util.Map getData() {
+ return getDataMap();
+ }
+ /**
+ * map<string, string> data = 3;
+ */
+
+ public java.util.Map getDataMap() {
+ return internalGetData().getMap();
+ }
+ /**
+ * map<string, string> data = 3;
+ */
+
+ public String getDataOrDefault(
+ String key,
+ String defaultValue) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
+ internalGetData().getMap();
+ return map.containsKey(key) ? map.get(key) : defaultValue;
+ }
+ /**
+ * map<string, string> data = 3;
+ */
+
+ public String getDataOrThrow(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
+ internalGetData().getMap();
+ if (!map.containsKey(key)) {
+ throw new IllegalArgumentException();
+ }
+ return map.get(key);
+ }
+
+ private byte memoizedIsInitialized = -1;
+ @Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ if (!getKeyBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, key_);
+ }
+ if (timestamp_ != 0L) {
+ output.writeInt64(2, timestamp_);
+ }
+ com.google.protobuf.GeneratedMessageV3
+ .serializeStringMapTo(
+ output,
+ internalGetData(),
+ DataDefaultEntryHolder.defaultEntry,
+ 3);
+ unknownFields.writeTo(output);
+ }
+
+ @Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (!getKeyBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, key_);
+ }
+ if (timestamp_ != 0L) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt64Size(2, timestamp_);
+ }
+ for (java.util.Map.Entry entry
+ : internalGetData().getMap().entrySet()) {
+ com.google.protobuf.MapEntry
+ data__ = DataDefaultEntryHolder.defaultEntry.newBuilderForType()
+ .setKey(entry.getKey())
+ .setValue(entry.getValue())
+ .build();
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(3, data__);
+ }
+ size += unknownFields.getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof Model)) {
+ return super.equals(obj);
+ }
+ Model other = (Model) obj;
+
+ if (!getKey()
+ .equals(other.getKey())) return false;
+ if (getTimestamp()
+ != other.getTimestamp()) return false;
+ if (!internalGetData().equals(
+ other.internalGetData())) return false;
+ if (!unknownFields.equals(other.unknownFields)) return false;
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ hash = (37 * hash) + KEY_FIELD_NUMBER;
+ hash = (53 * hash) + getKey().hashCode();
+ hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+ getTimestamp());
+ if (!internalGetData().getMap().isEmpty()) {
+ hash = (37 * hash) + DATA_FIELD_NUMBER;
+ hash = (53 * hash) + internalGetData().hashCode();
+ }
+ hash = (29 * hash) + unknownFields.hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static Model parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static Model parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static Model parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static Model parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static Model parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static Model parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static Model parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static Model parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static Model parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+ public static Model parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static Model parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static Model parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ @Override
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(Model prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ @Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE
+ ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @Override
+ protected Builder newBuilderForType(
+ BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * Protobuf type {@code com.farsunset.cim.sdk.model.proto.Model}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageV3.Builder implements
+ // @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.model.proto.Model)
+ ModelOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
+ }
+
+ @SuppressWarnings({"rawtypes"})
+ protected com.google.protobuf.MapField internalGetMapField(
+ int number) {
+ switch (number) {
+ case 3:
+ return internalGetData();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @SuppressWarnings({"rawtypes"})
+ protected com.google.protobuf.MapField internalGetMutableMapField(
+ int number) {
+ switch (number) {
+ case 3:
+ return internalGetMutableData();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @Override
+ protected FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ Model.class, Builder.class);
+ }
+
+ // Construct using com.farsunset.cim.sdk.model.proto.SentBodyProto.Model.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3
+ .alwaysUseFieldBuilders) {
+ }
+ }
+ @Override
+ public Builder clear() {
+ super.clear();
+ key_ = "";
+
+ timestamp_ = 0L;
+
+ internalGetMutableData().clear();
+ return this;
+ }
+
+ @Override
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return SentBodyProto.internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
+ }
+
+ @Override
+ public Model getDefaultInstanceForType() {
+ return Model.getDefaultInstance();
+ }
+
+ @Override
+ public Model build() {
+ Model result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ @Override
+ public Model buildPartial() {
+ Model result = new Model(this);
+ int from_bitField0_ = bitField0_;
+ result.key_ = key_;
+ result.timestamp_ = timestamp_;
+ result.data_ = internalGetData();
+ result.data_.makeImmutable();
+ onBuilt();
+ return result;
+ }
+
+ @Override
+ public Builder clone() {
+ return super.clone();
+ }
+ @Override
+ public Builder setField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ Object value) {
+ return super.setField(field, value);
+ }
+ @Override
+ public Builder clearField(
+ com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return super.clearField(field);
+ }
+ @Override
+ public Builder clearOneof(
+ com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return super.clearOneof(oneof);
+ }
+ @Override
+ public Builder setRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ int index, Object value) {
+ return super.setRepeatedField(field, index, value);
+ }
+ @Override
+ public Builder addRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ Object value) {
+ return super.addRepeatedField(field, value);
+ }
+ @Override
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof Model) {
+ return mergeFrom((Model)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(Model other) {
+ if (other == Model.getDefaultInstance()) return this;
+ if (!other.getKey().isEmpty()) {
+ key_ = other.key_;
+ onChanged();
+ }
+ if (other.getTimestamp() != 0L) {
+ setTimestamp(other.getTimestamp());
+ }
+ internalGetMutableData().mergeFrom(
+ other.internalGetData());
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
+ return this;
+ }
+
+ @Override
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ @Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ Model parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (Model) e.getUnfinishedMessage();
+ throw e.unwrapIOException();
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+ private int bitField0_;
+
+ private Object key_ = "";
+ /**
+ * string key = 1;
+ * @return The key.
+ */
+ public String getKey() {
+ Object ref = key_;
+ if (!(ref instanceof String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ String s = bs.toStringUtf8();
+ key_ = s;
+ return s;
+ } else {
+ return (String) ref;
+ }
+ }
+ /**
+ * string key = 1;
+ * @return The bytes for key.
+ */
+ public com.google.protobuf.ByteString
+ getKeyBytes() {
+ Object ref = key_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (String) ref);
+ key_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string key = 1;
+ * @param value The key to set.
+ * @return This builder for chaining.
+ */
+ public Builder setKey(
+ String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ key_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string key = 1;
+ * @return This builder for chaining.
+ */
+ public Builder clearKey() {
+
+ key_ = getDefaultInstance().getKey();
+ onChanged();
+ return this;
+ }
+ /**
+ * string key = 1;
+ * @param value The bytes for key to set.
+ * @return This builder for chaining.
+ */
+ public Builder setKeyBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ key_ = value;
+ onChanged();
+ return this;
+ }
+
+ private long timestamp_ ;
+ /**
+ * int64 timestamp = 2;
+ * @return The timestamp.
+ */
+ public long getTimestamp() {
+ return timestamp_;
+ }
+ /**
+ * int64 timestamp = 2;
+ * @param value The timestamp to set.
+ * @return This builder for chaining.
+ */
+ public Builder setTimestamp(long value) {
+
+ timestamp_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * int64 timestamp = 2;
+ * @return This builder for chaining.
+ */
+ public Builder clearTimestamp() {
+
+ timestamp_ = 0L;
+ onChanged();
+ return this;
+ }
+
+ private com.google.protobuf.MapField<
+ String, String> data_;
+ private com.google.protobuf.MapField
+ internalGetData() {
+ if (data_ == null) {
+ return com.google.protobuf.MapField.emptyMapField(
+ DataDefaultEntryHolder.defaultEntry);
+ }
+ return data_;
+ }
+ private com.google.protobuf.MapField
+ internalGetMutableData() {
+ onChanged();;
+ if (data_ == null) {
+ data_ = com.google.protobuf.MapField.newMapField(
+ DataDefaultEntryHolder.defaultEntry);
+ }
+ if (!data_.isMutable()) {
+ data_ = data_.copy();
+ }
+ return data_;
+ }
+
+ public int getDataCount() {
+ return internalGetData().getMap().size();
+ }
+ /**
+ * map<string, string> data = 3;
+ */
+
+ public boolean containsData(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ return internalGetData().getMap().containsKey(key);
+ }
+ /**
+ * Use {@link #getDataMap()} instead.
+ */
+ @Deprecated
+ public java.util.Map getData() {
+ return getDataMap();
+ }
+ /**
+ * map<string, string> data = 3;
+ */
+
+ public java.util.Map getDataMap() {
+ return internalGetData().getMap();
+ }
+ /**
+ * map<string, string> data = 3;
+ */
+
+ public String getDataOrDefault(
+ String key,
+ String defaultValue) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
+ internalGetData().getMap();
+ return map.containsKey(key) ? map.get(key) : defaultValue;
+ }
+ /**
+ * map<string, string> data = 3;
+ */
+
+ public String getDataOrThrow(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ java.util.Map map =
+ internalGetData().getMap();
+ if (!map.containsKey(key)) {
+ throw new IllegalArgumentException();
+ }
+ return map.get(key);
+ }
+
+ public Builder clearData() {
+ internalGetMutableData().getMutableMap()
+ .clear();
+ return this;
+ }
+ /**
+ * map<string, string> data = 3;
+ */
+
+ public Builder removeData(
+ String key) {
+ if (key == null) { throw new NullPointerException(); }
+ internalGetMutableData().getMutableMap()
+ .remove(key);
+ return this;
+ }
+ /**
+ * Use alternate mutation accessors instead.
+ */
+ @Deprecated
+ public java.util.Map
+ getMutableData() {
+ return internalGetMutableData().getMutableMap();
+ }
+ /**
+ * map<string, string> data = 3;
+ */
+ public Builder putData(
+ String key,
+ String value) {
+ if (key == null) { throw new NullPointerException(); }
+ if (value == null) { throw new NullPointerException(); }
+ internalGetMutableData().getMutableMap()
+ .put(key, value);
+ return this;
+ }
+ /**
+ * map<string, string> data = 3;
+ */
+
+ public Builder putAllData(
+ java.util.Map values) {
+ internalGetMutableData().getMutableMap()
+ .putAll(values);
+ return this;
+ }
+ @Override
+ public final Builder setUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFields(unknownFields);
+ }
+
+ @Override
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+
+ // @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.model.proto.Model)
+ }
+
+ // @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.model.proto.Model)
+ private static final Model DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new Model();
+ }
+
+ public static Model getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ @Override
+ public Model parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new Model(input, extensionRegistry);
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ @Override
+ public Model getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+ }
+
+ private static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor;
+ private static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable;
+ private static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor;
+ private static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_fieldAccessorTable;
+
+ public static com.google.protobuf.Descriptors.FileDescriptor
+ getDescriptor() {
+ return descriptor;
+ }
+ private static com.google.protobuf.Descriptors.FileDescriptor
+ descriptor;
+ static {
+ String[] descriptorData = {
+ "\n\016SentBody.proto\022!com.farsunset.cim.sdk." +
+ "model.proto\"\226\001\n\005Model\022\013\n\003key\030\001 \001(\t\022\021\n\tti" +
+ "mestamp\030\002 \001(\003\022@\n\004data\030\003 \003(\01322.com.farsun" +
+ "set.cim.sdk.model.proto.Model.DataEntry\032" +
+ "+\n\tDataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t" +
+ ":\0028\001B\017B\rSentBodyProtob\006proto3"
+ };
+ descriptor = com.google.protobuf.Descriptors.FileDescriptor
+ .internalBuildGeneratedFileFrom(descriptorData,
+ new com.google.protobuf.Descriptors.FileDescriptor[] {
+ });
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor,
+ new String[] { "Key", "Timestamp", "Data", });
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor =
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_descriptor.getNestedTypes().get(0);
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_com_farsunset_cim_sdk_model_proto_Model_DataEntry_descriptor,
+ new String[] { "Key", "Value", });
+ }
+
+ // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/cim-client-sdk/cim-web-sdk/cim.web.sdk.js b/cim-client-sdk/cim-web-sdk/cim.web.sdk.js
index e357c74..59ea3f5 100644
--- a/cim-client-sdk/cim-web-sdk/cim.web.sdk.js
+++ b/cim-client-sdk/cim-web-sdk/cim.web.sdk.js
@@ -1,216 +1,181 @@
/*CIM服务器IP*/
-var CIM_HOST = "127.0.0.1";
-/*CIM服务端口*/
-var CIM_PORT = 23456;
-var CIM_URI="ws://"+CIM_HOST+":"+CIM_PORT;
+const CIM_HOST = "127.0.0.1";
+/*
+ *服务端 websocket端口
+ */
+const CIM_PORT = 34567;
+const CIM_URI = "ws://" + CIM_HOST + ":" + CIM_PORT;
-var CMD_HEARTBEAT_RESPONSE = new Uint8Array([67,82]);
-var SDK_VERSION = "1.0.0";
-var SDK_CHANNEL = "browser";
-var APP_PACKAGE = "com.farsunset.cim";
-var ACTION_999 = "999";//特殊的消息类型，代表被服务端强制下线
-var DATA_HEADER_LENGTH = 3;
+const APP_VERSION = "1.0.0";
+const APP_CHANNEL = "browser";
+const APP_PACKAGE = "com.farsunset.cim";
-var C_H_RS = 0;
-var S_H_RQ = 1;
-var MESSAGE = 2;
-var SENTBODY = 3;
-var REPLYBODY = 4;
+/*
+ *特殊的消息类型，代表被服务端强制下线
+ */
+const ACTION_999 = "999";
+const DATA_HEADER_LENGTH = 1;
-var socket;
-var manualStop = false;
-var CIMPushManager = {};
-CIMPushManager.connection = function(){
- manualStop = false;
- window.localStorage.account = '';
- socket = new WebSocket(CIM_URI);
- socket.cookieEnabled = false;
- socket.binaryType = 'arraybuffer';
- socket.onopen = CIMPushManager.innerOnConnectionSuccessed;
- socket.onmessage = CIMPushManager.innerOnMessageReceived;
+const MESSAGE = 2;
+const REPLY_BODY = 4;
+
+let socket;
+let manualStop = false;
+const CIMPushManager = {};
+CIMPushManager.connect = function () {
+ manualStop = false;
+ window.localStorage.account = '';
+ socket = new WebSocket(CIM_URI);
+ socket.cookieEnabled = false;
+ socket.binaryType = 'arraybuffer';
+ socket.onopen = CIMPushManager.innerOnConnectFinished;
+ socket.onmessage = CIMPushManager.innerOnMessageReceived;
socket.onclose = CIMPushManager.innerOnConnectionClosed;
};
-CIMPushManager.bindAccount = function(account){
-
- window.localStorage.account = account;
-
- var deviceId = window.localStorage.deviceIddeviceId;
- if(deviceId == '' || deviceId == undefined){
- deviceId = generateUUID();
- window.localStorage.deviceId = deviceId;
- }
+CIMPushManager.bindAccount = function (account) {
- var browser = getBrowser();
- var body = new proto.com.farsunset.cim.sdk.web.model.SentBody();
- body.setKey("client_bind");
- body.getDataMap().set("account",account);
- body.getDataMap().set("channel",SDK_CHANNEL);
- body.getDataMap().set("version",SDK_VERSION);
- body.getDataMap().set("osVersion", browser.version);
- body.getDataMap().set("packageName", APP_PACKAGE);
- body.getDataMap().set("deviceId", deviceId);
- body.getDataMap().set("device", browser.name);
- CIMPushManager.sendRequest(body);
+ window.localStorage.account = account;
+
+ let deviceId = window.localStorage.deviceIddeviceId;
+ if (deviceId == '' || deviceId == undefined) {
+ deviceId = generateUUID();
+ window.localStorage.deviceId = deviceId;
+ }
+
+ let browser = getBrowser();
+ let body = new proto.com.farsunset.cim.sdk.web.model.SentBody();
+ body.setKey("client_bind");
+ body.setTimestamp(new Date().getTime());
+ body.getDataMap().set("account", account);
+ body.getDataMap().set("channel", APP_CHANNEL);
+ body.getDataMap().set("appVersion", APP_VERSION);
+ body.getDataMap().set("osVersion", browser.version);
+ body.getDataMap().set("packageName", APP_PACKAGE);
+ body.getDataMap().set("deviceId", deviceId);
+ body.getDataMap().set("device", browser.name);
+ CIMPushManager.sendRequest(body);
};
-CIMPushManager.stop = function(){
- manualStop = true;
- socket.close();
+CIMPushManager.stop = function () {
+ manualStop = true;
+ socket.close();
};
-CIMPushManager.resume = function(){
+CIMPushManager.resume = function () {
manualStop = false;
- CIMPushManager.connection();
+ CIMPushManager.connect();
};
-CIMPushManager.innerOnConnectionSuccessed = function(){
- var account = window.localStorage.account;
- if(account == '' || account == undefined){
- onConnectionSuccessed();
- }else{
- CIMPushManager.bindAccount(account);
- }
-};
-
-
-
-CIMPushManager.innerOnMessageReceived = function(e){
- var data = new Uint8Array(e.data);
-
- var type = data[0];
-
- /**
- * 收到服务端发来的心跳请求，立即回复响应，否则服务端会在10秒后断开连接
- */
- if(type == S_H_RQ){
- CIMPushManager.sendHeartbeatResponse();
- return;
- }
-
- if(type == MESSAGE){
- var length = getContentLength(data[1],data[2]);
- var data = proto.com.farsunset.cim.sdk.web.model.Message.deserializeBinary(data.subarray(DATA_HEADER_LENGTH,DATA_HEADER_LENGTH+length));
- onInterceptMessageReceived(data.toObject(false));
- return;
- }
-
- if(type == REPLYBODY){
- var length = getContentLength(data[1],data[2]);
- var data = proto.com.farsunset.cim.sdk.web.model.ReplyBody.deserializeBinary(data.subarray(DATA_HEADER_LENGTH,DATA_HEADER_LENGTH+length));
- /**
- * 将proto对象转换成json对象，去除无用信息
- */
- var reply = {};
- reply.code = data.getCode();
- reply.key = data.getKey();
- reply.message = data.getMessage();
- reply.timestamp = data.getTimestamp();
- reply.data = {};
-
- /**
- * 注意，遍历map这里的参数 value在前key在后
- */
- data.getDataMap().forEach(function (v,k){
- reply.data[k] = v;
- });
-
- onReplyReceived(reply);
- }
+CIMPushManager.innerOnConnectFinished = function () {
+ let account = window.localStorage.account;
+ if (account === '' || account === undefined) {
+ onConnectFinished();
+ } else {
+ CIMPushManager.bindAccount(account);
+ }
};
-CIMPushManager.innerOnConnectionClosed = function(e){
- if(!manualStop){
- var time = Math.floor(Math.random()*(30-15+1)+15);
- setTimeout(function(){
- CIMPushManager.connection();
- },time);
- }
+
+CIMPushManager.innerOnMessageReceived = function (e) {
+ let data = new Uint8Array(e.data);
+ let type = data[0];
+ let body = data.subarray(DATA_HEADER_LENGTH, data.length);
+
+ if (type == MESSAGE) {
+ let message = proto.com.farsunset.cim.sdk.web.model.Message.deserializeBinary(body);
+ onInterceptMessageReceived(message.toObject(false));
+ return;
+ }
+
+ if (type == REPLY_BODY) {
+ let message = proto.com.farsunset.cim.sdk.web.model.ReplyBody.deserializeBinary(body);
+ /**
+ * 将proto对象转换成json对象，去除无用信息
+ */
+ let reply = {};
+ reply.code = message.getCode();
+ reply.key = message.getKey();
+ reply.message = message.getMessage();
+ reply.timestamp = message.getTimestamp();
+ reply.data = {};
+
+ /**
+ * 注意，遍历map这里的参数 value在前key在后
+ */
+ message.getDataMap().forEach(function (v, k) {
+ reply.data[k] = v;
+ });
+
+ onReplyReceived(reply);
+ }
};
-CIMPushManager.sendRequest = function(body){
-
- var data = body.serializeBinary();
- var header = buildHeader(SENTBODY,data.length);
- var protubuf = new Uint8Array(data.length + header.length);
- protubuf.set(header,0);
- protubuf.set(data,header.length);
- socket.send(protubuf);
+CIMPushManager.innerOnConnectionClosed = function (e) {
+ if (!manualStop) {
+ let time = Math.floor(Math.random() * (30 - 15 + 1) + 15);
+ setTimeout(function () {
+ CIMPushManager.connect();
+ }, time);
+ }
};
-CIMPushManager.sendHeartbeatResponse = function(){
- var data = CMD_HEARTBEAT_RESPONSE;
- var header = buildHeader(C_H_RS,data.length);
- var protubuf = new Uint8Array(data.length + header.length);
- protubuf.set(header,0);
- protubuf.set(data,header.length);
- socket.send(protubuf);
+CIMPushManager.sendRequest = function (body) {
+ let data = body.serializeBinary();
+ let protobuf = new Uint8Array(data.length);
+ protobuf.set(data, 0);
+ socket.send(protobuf);
};
-function getContentLength( lv, hv) {
- var l = (lv & 0xff);
- var h = (hv & 0xff);
- return (l | (h <<= 8));
-}
-
-function buildHeader(type,length){
- var header = new Uint8Array(DATA_HEADER_LENGTH);
- header[0] = type;
- header[1] = (length & 0xff);
- header[2] = ((length >> 8) & 0xff);
- return header;
-
-}
-function onInterceptMessageReceived(message){
- //被强制下线之后，不再继续连接服务端
- if(message.action == ACTION_999){
- manualStop = true;
- }
- //收到消息后，将消息发送给页面
- if(onMessageReceived instanceof Function){
- onMessageReceived(message);
- }
+function onInterceptMessageReceived(message) {
+ /*
+ *被强制下线之后，不再继续连接服务端
+ */
+ if (message.action == ACTION_999) {
+ manualStop = true;
+ }
+ /*
+ *收到消息后，将消息发送给页面
+ */
+ if (onMessageReceived instanceof Function) {
+ onMessageReceived(message);
+ }
}
function getBrowser() {
- var explorer = window.navigator.userAgent.toLowerCase() ;
- // ie
- if (explorer.indexOf("msie") >= 0) {
- var ver=explorer.match(/msie ([\d.]+)/)[1];
- return {name:"IE",version:ver};
- }
- // firefox
- else if (explorer.indexOf("firefox") >= 0) {
- var ver=explorer.match(/firefox\/([\d.]+)/)[1];
- return {name:"Firefox",version:ver};
- }
- // Chrome
- else if(explorer.indexOf("chrome") >= 0){
- var ver=explorer.match(/chrome\/([\d.]+)/)[1];
- return {name:"Chrome",version:ver};
- }
- // Opera
- else if(explorer.indexOf("opera") >= 0){
- var ver=explorer.match(/opera.([\d.]+)/)[1];
- return {name:"Opera",version:ver};
- }
- // Safari
- else if(explorer.indexOf("Safari") >= 0){
- var ver=explorer.match(/version\/([\d.]+)/)[1];
- return {name:"Safari",version:ver};
- }
-
- return {name:"Other",version:"1.0.0"};
+ let explorer = window.navigator.userAgent.toLowerCase();
+ if (explorer.indexOf("msie") >= 0) {
+ let ver = explorer.match(/msie ([\d.]+)/)[1];
+ return {name: "IE", version: ver};
+ }
+ else if (explorer.indexOf("firefox") >= 0) {
+ let ver = explorer.match(/firefox\/([\d.]+)/)[1];
+ return {name: "Firefox", version: ver};
+ }
+ else if (explorer.indexOf("chrome") >= 0) {
+ let ver = explorer.match(/chrome\/([\d.]+)/)[1];
+ return {name: "Chrome", version: ver};
+ }
+ else if (explorer.indexOf("opera") >= 0) {
+ let ver = explorer.match(/opera.([\d.]+)/)[1];
+ return {name: "Opera", version: ver};
+ }
+ else if (explorer.indexOf("Safari") >= 0) {
+ let ver = explorer.match(/version\/([\d.]+)/)[1];
+ return {name: "Safari", version: ver};
+ }
+
+ return {name: "Other", version: "1.0.0"};
}
function generateUUID() {
- var d = new Date().getTime();
- var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
- var r = (d + Math.random()*16)%16 | 0;
- d = Math.floor(d/16);
- return (c=='x' ? r : (r&0x3|0x8)).toString(16);
- });
- return uuid.replace(/-/g,'');
+ let d = new Date().getTime();
+ let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+ let r = (d + Math.random() * 16) % 16 | 0;
+ d = Math.floor(d / 16);
+ return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+ });
+ return uuid.replace(/-/g, '');
}
\ No newline at end of file
diff --git a/cim-server-sdk/cim-server-sdk-mina/.classpath b/cim-server-sdk/cim-server-sdk-mina/.classpath
deleted file mode 100644
index 1121c4a..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cim-server-sdk/cim-server-sdk-mina/.gitignore b/cim-server-sdk/cim-server-sdk-mina/.gitignore
new file mode 100644
index 0000000..07827cc
--- /dev/null
+++ b/cim-server-sdk/cim-server-sdk-mina/.gitignore
@@ -0,0 +1,2 @@
+target/
+.idea/
\ No newline at end of file
diff --git a/cim-server-sdk/cim-server-sdk-mina/.project b/cim-server-sdk/cim-server-sdk-mina/.project
deleted file mode 100644
index 3bd7588..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- cim-server-sdk-mina
-
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.wst.common.project.facet.core.nature
-
-
diff --git a/cim-server-sdk/cim-server-sdk-mina/.settings/org.eclipse.core.resources.prefs b/cim-server-sdk/cim-server-sdk-mina/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99b2bf9..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Oct 15 09:31:41 CST 2014
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/cim-server-sdk/cim-server-sdk-mina/.settings/org.eclipse.jdt.core.prefs b/cim-server-sdk/cim-server-sdk-mina/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/cim-server-sdk/cim-server-sdk-mina/.settings/org.eclipse.wst.common.project.facet.core.xml b/cim-server-sdk/cim-server-sdk-mina/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index c56e134..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/cim-server-sdk/cim-server-sdk-mina/cim-server-sdk-mina.iml b/cim-server-sdk/cim-server-sdk-mina/cim-server-sdk-mina.iml
new file mode 100644
index 0000000..78b2cc5
--- /dev/null
+++ b/cim-server-sdk/cim-server-sdk-mina/cim-server-sdk-mina.iml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/cim-server-sdk/cim-server-sdk-mina/jar.bat b/cim-server-sdk/cim-server-sdk-mina/jar.bat
new file mode 100644
index 0000000..f0b4c1c
--- /dev/null
+++ b/cim-server-sdk/cim-server-sdk-mina/jar.bat
@@ -0,0 +1 @@
+mvn clean package
\ No newline at end of file
diff --git a/cim-server-sdk/cim-server-sdk-mina/jar.sh b/cim-server-sdk/cim-server-sdk-mina/jar.sh
new file mode 100644
index 0000000..f0b4c1c
--- /dev/null
+++ b/cim-server-sdk/cim-server-sdk-mina/jar.sh
@@ -0,0 +1 @@
+mvn clean package
\ No newline at end of file
diff --git a/cim-server-sdk/cim-server-sdk-mina/libs/mina-core-2.1.3.jar b/cim-server-sdk/cim-server-sdk-mina/libs/mina-core-2.1.3.jar
deleted file mode 100644
index fc90492..0000000
Binary files a/cim-server-sdk/cim-server-sdk-mina/libs/mina-core-2.1.3.jar and /dev/null differ
diff --git a/cim-server-sdk/cim-server-sdk-mina/libs/protobuf-java-3.9.1.jar b/cim-server-sdk/cim-server-sdk-mina/libs/protobuf-java-3.9.1.jar
deleted file mode 100644
index a87a5cf..0000000
Binary files a/cim-server-sdk/cim-server-sdk-mina/libs/protobuf-java-3.9.1.jar and /dev/null differ
diff --git a/cim-server-sdk/cim-server-sdk-mina/libs/slf4j-api-1.7.25.jar b/cim-server-sdk/cim-server-sdk-mina/libs/slf4j-api-1.7.25.jar
deleted file mode 100644
index 0143c09..0000000
Binary files a/cim-server-sdk/cim-server-sdk-mina/libs/slf4j-api-1.7.25.jar and /dev/null differ
diff --git a/cim-server-sdk/cim-server-sdk-mina/pom.xml b/cim-server-sdk/cim-server-sdk-mina/pom.xml
new file mode 100644
index 0000000..3c1e90c
--- /dev/null
+++ b/cim-server-sdk/cim-server-sdk-mina/pom.xml
@@ -0,0 +1,55 @@
+
+
+ 4.0.0
+
+ com.farsunset
+ cim-server-sdk-mina
+ 3.8.0
+ jar
+
+
+ UTF-8
+ UTF-8
+ 1.8
+ 3.11.1
+ 2.1.3
+ 1.7.30
+
+
+
+
+
+ org.apache.mina
+ mina-core
+ ${mina.version}
+
+
+
+ com.google.protobuf
+ protobuf-java
+ ${protobuf.java.version}
+
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j.version}
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.8.1
+
+ 8
+ 8
+
+
+
+
+
\ No newline at end of file
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/META-INF/MANIFEST.MF b/cim-server-sdk/cim-server-sdk-mina/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/exception/ServerSocketBindException.java b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/exception/ServerSocketBindException.java
deleted file mode 100644
index b608414..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/exception/ServerSocketBindException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.server.exception;
-
-public class ServerSocketBindException extends RuntimeException {
-
- private static final long serialVersionUID = 1L;
-
- public ServerSocketBindException(int port,Throwable cause) {
- super("cim server bind failed, port:" + port,cause);
- }
-
-}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/CIMLoggingFilter.java b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/CIMLoggingFilter.java
deleted file mode 100644
index 6cd74e9..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/CIMLoggingFilter.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.server.filter;
-
-import org.apache.mina.core.filterchain.IoFilterAdapter;
-import org.apache.mina.core.session.IdleStatus;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.core.write.WriteRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.farsunset.cim.sdk.server.constant.CIMConstant;
-
-/**
- * 日志打印，添加session 的id和ip address
- */
-public class CIMLoggingFilter extends IoFilterAdapter {
-
- private final Logger logger = LoggerFactory.getLogger(CIMLoggingFilter.class);
-
- @Override
- public void exceptionCaught(NextFilter nextFilter, IoSession session, Throwable cause) {
- logger.error("EXCEPTION" + getSessionInfo(session) + "\n{}", cause);
- nextFilter.exceptionCaught(session, cause);
- }
-
- @Override
- public void messageReceived(NextFilter nextFilter, IoSession session, Object message) {
- logger.info("RECEIVED" + getSessionInfo(session) + "\n{}", message);
- nextFilter.messageReceived(session, message);
- }
-
- @Override
- public void messageSent(NextFilter nextFilter, IoSession session, WriteRequest writeRequest) {
- logger.info("SENT" + getSessionInfo(session) + "\n{}", writeRequest.getOriginalMessage());
- nextFilter.messageSent(session, writeRequest);
- }
-
- @Override
- public void sessionCreated(NextFilter nextFilter, IoSession session) throws Exception {
- logger.info("CREATED" + getSessionInfo(session));
- nextFilter.sessionCreated(session);
- }
-
- @Override
- public void sessionOpened(NextFilter nextFilter, IoSession session) throws Exception {
- logger.info("OPENED" + getSessionInfo(session));
- nextFilter.sessionOpened(session);
- }
-
- @Override
- public void sessionIdle(NextFilter nextFilter, IoSession session, IdleStatus status) {
- logger.info("IDLE" + getSessionInfo(session));
- nextFilter.sessionIdle(session, status);
- }
-
- @Override
- public void sessionClosed(NextFilter nextFilter, IoSession session) {
- logger.info("CLOSED" + getSessionInfo(session));
- nextFilter.sessionClosed(session);
- }
-
- private String getSessionInfo(IoSession session) {
- StringBuilder builder = new StringBuilder();
- if (session == null) {
- return "";
- }
- builder.append(" [");
- builder.append("id:").append(session.getId());
-
- if (session.getLocalAddress() != null) {
- builder.append(" L:").append(session.getLocalAddress().toString());
- }
-
-
- if (session.getRemoteAddress() != null) {
- builder.append(" R:").append(session.getRemoteAddress().toString());
- }
-
- if (session.containsAttribute(CIMConstant.KEY_ACCOUNT)) {
- builder.append(" account:").append(session.getAttribute(CIMConstant.KEY_ACCOUNT));
- }
- builder.append("]");
- return builder.toString();
- }
-}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/ServerMessageDecoder.java b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/ServerMessageDecoder.java
deleted file mode 100644
index a7941d7..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/ServerMessageDecoder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.server.filter;
-
-import org.apache.mina.filter.codec.demux.DemuxingProtocolDecoder;
-
-import com.farsunset.cim.sdk.server.filter.decoder.AppMessageDecoder;
-import com.farsunset.cim.sdk.server.filter.decoder.WebMessageDecoder;
-
-/**
- * 服务端接收消息解码
- */
-public class ServerMessageDecoder extends DemuxingProtocolDecoder {
-
- public ServerMessageDecoder() {
- addMessageDecoder(new AppMessageDecoder());
- addMessageDecoder(new WebMessageDecoder());
- }
-}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/ServerMessageEncoder.java b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/ServerMessageEncoder.java
deleted file mode 100644
index 5bca279..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/ServerMessageEncoder.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.server.filter;
-
-import java.util.Objects;
-
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
-import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-
-import com.farsunset.cim.sdk.server.constant.CIMConstant;
-import com.farsunset.cim.sdk.server.model.HandshakerResponse;
-import com.farsunset.cim.sdk.server.model.feature.EncodeFormatable;
-import com.farsunset.cim.sdk.server.model.CIMSession;
-
-/**
- * 服务端发送消息前编码
- */
-public class ServerMessageEncoder extends ProtocolEncoderAdapter {
-
-
- @Override
- public void encode(IoSession iosession, Object object, ProtocolEncoderOutput out) throws Exception {
-
- Object protocol = iosession.getAttribute(CIMSession.PROTOCOL);
-
- /**
- * websocket的握手响应
- */
- if (Objects.equals(CIMSession.WEBSOCKET, protocol) && object instanceof HandshakerResponse) {
- HandshakerResponse data = (HandshakerResponse) object;
- byte[] byteArray = data.getBytes();
- IoBuffer buff = IoBuffer.allocate(byteArray.length).setAutoExpand(true);
- buff.put(byteArray);
- buff.flip();
- out.write(buff);
- }
-
- /**
- * websocket的业务数据
- */
- if (Objects.equals(CIMSession.WEBSOCKET, protocol) && object instanceof EncodeFormatable) {
- EncodeFormatable data = (EncodeFormatable) object;
-
- byte[] body = data.getProtobufBody();
- byte[] header = createHeader(data.getDataType(), body.length);
- byte[] protobuf = new byte[body.length + CIMConstant.DATA_HEADER_LENGTH];
- System.arraycopy(header, 0, protobuf, 0, header.length);
- System.arraycopy(body,0, protobuf, header.length, body.length);
-
- byte[] binaryFrame = encodeDataFrame(protobuf);
- IoBuffer buffer = IoBuffer.allocate(binaryFrame.length);
- buffer.put(binaryFrame);
- buffer.flip();
- out.write(buffer);
- }
-
- /**
- * 非websocket的数据传输使用Protobuf编码数据格式
- */
- if (!Objects.equals(CIMSession.WEBSOCKET, protocol) && object instanceof EncodeFormatable) {
-
- EncodeFormatable data = (EncodeFormatable) object;
- byte[] byteArray = data.getProtobufBody();
- IoBuffer buff = IoBuffer.allocate(byteArray.length + CIMConstant.DATA_HEADER_LENGTH).setAutoExpand(true);
- buff.put(createHeader(data.getDataType(), byteArray.length));
- buff.put(byteArray);
-
- buff.flip();
- out.write(buff);
- }
- }
-
- /**
- * 消息体最大为65535
- *
- * @param type
- * @param length
- * @return
- */
- private byte[] createHeader(byte type, int length) {
- byte[] header = new byte[CIMConstant.DATA_HEADER_LENGTH];
- header[0] = type;
- header[1] = (byte) (length & 0xff);
- header[2] = (byte) ((length >> 8) & 0xff);
- return header;
- }
-
- /**
- * 发送到websocket的数据需要进行相关格式转换 对传入数据进行无掩码转换
- *
- * @param data
- * @return
- */
- public static byte[] encodeDataFrame(byte[] data) {
- // 掩码开始位置
- int maskIndex = 2;
-
- // 计算掩码开始位置
- if (data.length <= 125) {
- maskIndex = 2;
- } else if (data.length > 65536) {
- maskIndex = 10;
- } else if (data.length > 125) {
- maskIndex = 4;
- }
-
- // 创建返回数据
- byte[] result = new byte[data.length + maskIndex];
-
- // 开始计算ws-frame
- // frame-fin + frame-rsv1 + frame-rsv2 + frame-rsv3 + frame-opcode
- result[0] = (byte) 0x82; // 0x82 二进制帧 0x80 文本帧
-
- // frame-masked+frame-payload-length
- // 从第9个字节开始是 1111101=125,掩码是第3-第6个数据
- // 从第9个字节开始是 1111110>=126,掩码是第5-第8个数据
- if (data.length <= 125) {
- result[1] = (byte) (data.length);
- } else if (data.length > 65536) {
- result[1] = 0x7F; // 127
- } else if (data.length > 125) {
- result[1] = 0x7E; // 126
- result[2] = (byte) (data.length >> 8);
- result[3] = (byte) (data.length % 256);
- }
-
- // 将数据编码放到最后
- for (int i = 0; i < data.length; i++) {
- result[i + maskIndex] = data[i];
- }
-
- return result;
- }
-
-}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/decoder/AppMessageDecoder.java b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/decoder/AppMessageDecoder.java
deleted file mode 100644
index 540d71d..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/decoder/AppMessageDecoder.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.server.filter.decoder;
-
-import java.util.Objects;
-
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-import org.apache.mina.filter.codec.demux.MessageDecoderAdapter;
-import org.apache.mina.filter.codec.demux.MessageDecoderResult;
-
-import com.farsunset.cim.sdk.server.constant.CIMConstant;
-import com.farsunset.cim.sdk.server.model.HeartbeatResponse;
-import com.farsunset.cim.sdk.server.model.SentBody;
-import com.farsunset.cim.sdk.server.model.proto.SentBodyProto;
-import com.farsunset.cim.sdk.server.model.CIMSession;
-
-/**
- * 原生app发送的消息解码器
- */
-public class AppMessageDecoder extends MessageDecoderAdapter {
-
-
- @Override
- public MessageDecoderResult decodable(IoSession arg0, IoBuffer iobuffer) {
-
- /**
- * 如果是Websocket客户端，则不作处理，由WebMessageDecoder进行处理
- */
- if(Objects.equals(arg0.getAttribute(CIMSession.PROTOCOL), CIMSession.WEBSOCKET)) {
- return NOT_OK;
- }
-
- if(Objects.equals(arg0.getAttribute(CIMSession.PROTOCOL), CIMSession.NATIVEAPP)) {
- return OK;
- }
-
- if (iobuffer.remaining() < CIMConstant.DATA_HEADER_LENGTH) {
- return NEED_DATA;
- }
-
- /**
- * 原生SDK只会发送2种类型消息 1个心跳类型 另一个是sendbody，报文的第一个字节为消息类型
- */
- byte conetnType = iobuffer.get();
- if (conetnType == CIMConstant.ProtobufType.C_H_RS || conetnType == CIMConstant.ProtobufType.SENTBODY) {
- return OK;
- }
-
- return NOT_OK;
-
- }
-
- @Override
- public MessageDecoderResult decode(IoSession iosession, IoBuffer iobuffer, ProtocolDecoderOutput out)
- throws Exception {
- iobuffer.mark();
-
- byte conetnType = iobuffer.get();
- byte lv = iobuffer.get();// int 低位
- byte hv = iobuffer.get();// int 高位
-
- int conetnLength = getContentLength(lv, hv);
-
- // 如果消息体没有接收完整，则重置读取，等待下一次重新读取
- if (conetnLength > iobuffer.remaining()) {
- iobuffer.reset();
- return NEED_DATA;
- }
-
- byte[] dataBytes = new byte[conetnLength];
- iobuffer.get(dataBytes, 0, conetnLength);
-
- Object message = mappingMessageObject(dataBytes, conetnType);
- if (message != null) {
- iosession.setAttribute(CIMSession.PROTOCOL,CIMSession.NATIVEAPP);
- out.write(message);
- }
- return OK;
- }
-
- public Object mappingMessageObject(byte[] data, byte type) throws Exception {
-
- if (CIMConstant.ProtobufType.C_H_RS == type) {
- HeartbeatResponse response = HeartbeatResponse.getInstance();
- return response;
- }
-
- if (CIMConstant.ProtobufType.SENTBODY == type) {
- SentBodyProto.Model bodyProto = SentBodyProto.Model.parseFrom(data);
- SentBody body = new SentBody();
- body.setKey(bodyProto.getKey());
- body.setTimestamp(bodyProto.getTimestamp());
- body.putAll(bodyProto.getDataMap());
- return body;
- }
- return null;
- }
-
- /**
- * 解析消息体长度
- *
- * @param type
- * @param length
- * @return
- */
- private int getContentLength(byte lv, byte hv) {
- int l = (lv & 0xff);
- int h = (hv & 0xff);
- return (l | (h <<= 8));
- }
-
-}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java
deleted file mode 100644
index b428aff..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.server.handler;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.apache.mina.core.service.IoAcceptor;
-import org.apache.mina.core.service.IoHandlerAdapter;
-import org.apache.mina.core.session.IdleStatus;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.mina.filter.executor.ExecutorFilter;
-import org.apache.mina.filter.keepalive.KeepAliveFilter;
-import org.apache.mina.filter.keepalive.KeepAliveMessageFactory;
-import org.apache.mina.transport.socket.DefaultSocketSessionConfig;
-import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
-
-import com.farsunset.cim.sdk.server.constant.CIMConstant;
-import com.farsunset.cim.sdk.server.exception.ServerSocketBindException;
-import com.farsunset.cim.sdk.server.filter.CIMLoggingFilter;
-import com.farsunset.cim.sdk.server.filter.ServerMessageCodecFactory;
-import com.farsunset.cim.sdk.server.model.HeartbeatRequest;
-import com.farsunset.cim.sdk.server.model.HeartbeatResponse;
-import com.farsunset.cim.sdk.server.model.SentBody;
-import com.farsunset.cim.sdk.server.model.CIMSession;
-
-public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveMessageFactory {
-
- private HashMap innerHandlerMap = new HashMap();
- private CIMRequestHandler outerRequestHandler;
- private IoAcceptor acceptor;
- private int port;
- /*
- * 读写空闲2分钟后 服务端 -> 客户端 发起心跳请求
- */
- private final int IDLE_HEART_REQUEST_TIME = 120;
-
- /*
- * 发起心跳后等待客户端的心跳响应，超时10秒后断开连接
- */
- private final int HEART_RESPONSE_TIME_OUT = 10;
- private final int READ_BUFFER_SIZE = 1024;
-
- public void bind() {
-
- /**
- * 预制websocket握手请求的处理
- */
- innerHandlerMap.put(CIMConstant.CLIENT_WEBSOCKET_HANDSHAKE, new WebsocketHandler());
-
- acceptor = new NioSocketAcceptor();
- acceptor.getSessionConfig().setReadBufferSize(READ_BUFFER_SIZE);
- ((DefaultSocketSessionConfig) acceptor.getSessionConfig()).setKeepAlive(true);
- ((DefaultSocketSessionConfig) acceptor.getSessionConfig()).setTcpNoDelay(true);
-
- KeepAliveFilter keepAliveFilter = new KeepAliveFilter(this, IdleStatus.BOTH_IDLE);
- keepAliveFilter.setRequestInterval(IDLE_HEART_REQUEST_TIME);
- keepAliveFilter.setRequestTimeout(HEART_RESPONSE_TIME_OUT);
- keepAliveFilter.setForwardEvent(true);
-
- ExecutorService executor = Executors.newCachedThreadPool(runnable -> {
- Thread thread = Executors.defaultThreadFactory().newThread(runnable);
- thread.setName("mina-thread-" + thread.getId());
- return thread;
- });
-
- acceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(new ServerMessageCodecFactory()));
- acceptor.getFilterChain().addLast("logger", new CIMLoggingFilter());
- acceptor.getFilterChain().addLast("heartbeat", keepAliveFilter);
- acceptor.getFilterChain().addLast("executor", new ExecutorFilter(executor));
- acceptor.setHandler(this);
- try {
- acceptor.bind(new InetSocketAddress(port));
- } catch (IOException ignore) {
- throw new ServerSocketBindException(port,ignore);
- }
- }
-
- public void destroy() {
- if(acceptor == null) {
- return;
- }
- try {
- acceptor.unbind();
- acceptor.dispose();
- }catch(Exception ignore) {}
- }
- /**
- * 设置应用层的sentbody处理handler
- * @param outerRequestHandler
- */
- public void setAppSentBodyHandler(CIMRequestHandler outerRequestHandler) {
- this.outerRequestHandler = outerRequestHandler;
- }
-
- @Override
- public void messageReceived(IoSession ios, Object message) {
-
- SentBody body = (SentBody) message;
- CIMSession session = new CIMSession(ios);
-
- CIMRequestHandler handler = innerHandlerMap.get(body.getKey());
- /**
- * 如果有内置的特殊handler需要处理，则使用内置的
- */
- if (handler != null) {
- handler.process(session, body);
- return ;
- }
-
- /**
- * 有业务层去处理其他的sentbody
- */
- outerRequestHandler.process(session, body);
- }
-
- @Override
- public void sessionClosed(IoSession ios) {
-
- CIMSession session = new CIMSession(ios);
- SentBody body = new SentBody();
- body.setKey(CIMConstant.CLIENT_CONNECT_CLOSED);
- outerRequestHandler.process(session, body);
- }
-
- @Override
- public Object getRequest(IoSession session) {
- return HeartbeatRequest.getInstance();
- }
-
- @Override
- public Object getResponse(IoSession arg0, Object arg1) {
- return null;
- }
-
- @Override
- public boolean isRequest(IoSession arg0, Object arg1) {
- return false;
- }
-
- @Override
- public boolean isResponse(IoSession arg0, Object arg1) {
- return arg1 instanceof HeartbeatResponse;
- }
-
-
- @Override
- public void exceptionCaught(IoSession session, Throwable cause) {
-
- }
-
- public Map getManagedSessions() {
- return acceptor.getManagedSessions();
- }
-
- public IoSession getManagedSession(String nid) {
- if (nid == null) {
- return null;
- }
- try {
- return getManagedSessions().get(Long.parseLong(nid));
- }catch(Exception ignore) {
- return null;
- }
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
-
-}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/proto/ReplyBodyProto.java b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/proto/ReplyBodyProto.java
deleted file mode 100644
index d4cbab2..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/proto/ReplyBodyProto.java
+++ /dev/null
@@ -1,1204 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.server.model.proto;
-
-public final class ReplyBodyProto {
- private ReplyBodyProto() {
- }
-
- public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {
- }
-
- public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
- registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
- }
-
- public interface ModelOrBuilder extends
- // @@protoc_insertion_point(interface_extends:com.farsunset.cim.sdk.server.model.proto.Model)
- com.google.protobuf.MessageOrBuilder {
-
- /**
- * string key = 1;
- */
- java.lang.String getKey();
-
- /**
- * string key = 1;
- */
- com.google.protobuf.ByteString getKeyBytes();
-
- /**
- * string code = 2;
- */
- java.lang.String getCode();
-
- /**
- * string code = 2;
- */
- com.google.protobuf.ByteString getCodeBytes();
-
- /**
- * string message = 3;
- */
- java.lang.String getMessage();
-
- /**
- * string message = 3;
- */
- com.google.protobuf.ByteString getMessageBytes();
-
- /**
- * int64 timestamp = 4;
- */
- long getTimestamp();
-
- /**
- * map<string, string> data = 5;
- */
- int getDataCount();
-
- /**
- * map<string, string> data = 5;
- */
- boolean containsData(java.lang.String key);
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- java.util.Map getData();
-
- /**
- * map<string, string> data = 5;
- */
- java.util.Map getDataMap();
-
- /**
- * map<string, string> data = 5;
- */
-
- java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue);
-
- /**
- * map<string, string> data = 5;
- */
-
- java.lang.String getDataOrThrow(java.lang.String key);
- }
-
- /**
- * Protobuf type {@code com.farsunset.cim.sdk.server.model.proto.Model}
- */
- public static final class Model extends com.google.protobuf.GeneratedMessageV3 implements
- // @@protoc_insertion_point(message_implements:com.farsunset.cim.sdk.server.model.proto.Model)
- ModelOrBuilder {
- // Use Model.newBuilder() to construct.
- private Model(com.google.protobuf.GeneratedMessageV3.Builder builder) {
- super(builder);
- }
-
- private Model() {
- key_ = "";
- code_ = "";
- message_ = "";
- timestamp_ = 0L;
- }
-
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
- }
-
- private Model(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- this();
- int mutable_bitField0_ = 0;
- try {
- boolean done = false;
- while (!done) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- done = true;
- break;
- default: {
- if (!input.skipField(tag)) {
- done = true;
- }
- break;
- }
- case 10: {
- java.lang.String s = input.readStringRequireUtf8();
-
- key_ = s;
- break;
- }
- case 18: {
- java.lang.String s = input.readStringRequireUtf8();
-
- code_ = s;
- break;
- }
- case 26: {
- java.lang.String s = input.readStringRequireUtf8();
-
- message_ = s;
- break;
- }
- case 32: {
-
- timestamp_ = input.readInt64();
- break;
- }
- case 42: {
- if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
- data_ = com.google.protobuf.MapField.newMapField(DataDefaultEntryHolder.defaultEntry);
- mutable_bitField0_ |= 0x00000010;
- }
- com.google.protobuf.MapEntry data__ = input
- .readMessage(DataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
- data_.getMutableMap().put(data__.getKey(), data__.getValue());
- break;
- }
- }
- }
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw e.setUnfinishedMessage(this);
- } catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
- } finally {
- makeExtensionsImmutable();
- }
- }
-
- public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMapField(int number) {
- switch (number) {
- case 5:
- return internalGetData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model.class,
- com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model.Builder.class);
- }
-
- private int bitField0_;
- public static final int KEY_FIELD_NUMBER = 1;
- private volatile java.lang.Object key_;
-
- /**
- * string key = 1;
- */
- public java.lang.String getKey() {
- java.lang.Object ref = key_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- key_ = s;
- return s;
- }
- }
-
- /**
- * string key = 1;
- */
- public com.google.protobuf.ByteString getKeyBytes() {
- java.lang.Object ref = key_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- key_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- public static final int CODE_FIELD_NUMBER = 2;
- private volatile java.lang.Object code_;
-
- /**
- * string code = 2;
- */
- public java.lang.String getCode() {
- java.lang.Object ref = code_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- code_ = s;
- return s;
- }
- }
-
- /**
- * string code = 2;
- */
- public com.google.protobuf.ByteString getCodeBytes() {
- java.lang.Object ref = code_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- code_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- public static final int MESSAGE_FIELD_NUMBER = 3;
- private volatile java.lang.Object message_;
-
- /**
- * string message = 3;
- */
- public java.lang.String getMessage() {
- java.lang.Object ref = message_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- message_ = s;
- return s;
- }
- }
-
- /**
- * string message = 3;
- */
- public com.google.protobuf.ByteString getMessageBytes() {
- java.lang.Object ref = message_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- message_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- public static final int TIMESTAMP_FIELD_NUMBER = 4;
- private long timestamp_;
-
- /**
- * int64 timestamp = 4;
- */
- public long getTimestamp() {
- return timestamp_;
- }
-
- public static final int DATA_FIELD_NUMBER = 5;
-
- private static final class DataDefaultEntryHolder {
- static final com.google.protobuf.MapEntry defaultEntry = com.google.protobuf.MapEntry.newDefaultInstance(
- com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_descriptor,
- com.google.protobuf.WireFormat.FieldType.STRING, "",
- com.google.protobuf.WireFormat.FieldType.STRING, "");
- }
-
- private com.google.protobuf.MapField data_;
-
- private com.google.protobuf.MapField internalGetData() {
- if (data_ == null) {
- return com.google.protobuf.MapField.emptyMapField(DataDefaultEntryHolder.defaultEntry);
- }
- return data_;
- }
-
- public int getDataCount() {
- return internalGetData().getMap().size();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public boolean containsData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- return internalGetData().getMap().containsKey(key);
- }
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- public java.util.Map getData() {
- return getDataMap();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.util.Map getDataMap() {
- return internalGetData().getMap();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- return map.containsKey(key) ? map.get(key) : defaultValue;
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.lang.String getDataOrThrow(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
- }
- return map.get(key);
- }
-
- private byte memoizedIsInitialized = -1;
-
- public final boolean isInitialized() {
- byte isInitialized = memoizedIsInitialized;
- if (isInitialized == 1)
- return true;
- if (isInitialized == 0)
- return false;
-
- memoizedIsInitialized = 1;
- return true;
- }
-
- public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (!getKeyBytes().isEmpty()) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 1, key_);
- }
- if (!getCodeBytes().isEmpty()) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 2, code_);
- }
- if (!getMessageBytes().isEmpty()) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 3, message_);
- }
- if (timestamp_ != 0L) {
- output.writeInt64(4, timestamp_);
- }
- com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(output, internalGetData(),
- DataDefaultEntryHolder.defaultEntry, 5);
- }
-
- public int getSerializedSize() {
- int size = memoizedSize;
- if (size != -1)
- return size;
-
- size = 0;
- if (!getKeyBytes().isEmpty()) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, key_);
- }
- if (!getCodeBytes().isEmpty()) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, code_);
- }
- if (!getMessageBytes().isEmpty()) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, message_);
- }
- if (timestamp_ != 0L) {
- size += com.google.protobuf.CodedOutputStream.computeInt64Size(4, timestamp_);
- }
- for (java.util.Map.Entry entry : internalGetData().getMap()
- .entrySet()) {
- com.google.protobuf.MapEntry data__ = DataDefaultEntryHolder.defaultEntry
- .newBuilderForType().setKey(entry.getKey()).setValue(entry.getValue()).build();
- size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, data__);
- }
- memoizedSize = size;
- return size;
- }
-
- private static final long serialVersionUID = 0L;
-
- @java.lang.Override
- public boolean equals(final java.lang.Object obj) {
- if (obj == this) {
- return true;
- }
- if (!(obj instanceof com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model)) {
- return super.equals(obj);
- }
- com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model other = (com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model) obj;
-
- boolean result = true;
- result = result && getKey().equals(other.getKey());
- result = result && getCode().equals(other.getCode());
- result = result && getMessage().equals(other.getMessage());
- result = result && (getTimestamp() == other.getTimestamp());
- result = result && internalGetData().equals(other.internalGetData());
- return result;
- }
-
- @java.lang.Override
- public int hashCode() {
- if (memoizedHashCode != 0) {
- return memoizedHashCode;
- }
- int hash = 41;
- hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + KEY_FIELD_NUMBER;
- hash = (53 * hash) + getKey().hashCode();
- hash = (37 * hash) + CODE_FIELD_NUMBER;
- hash = (53 * hash) + getCode().hashCode();
- hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
- hash = (53 * hash) + getMessage().hashCode();
- hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
- hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getTimestamp());
- if (!internalGetData().getMap().isEmpty()) {
- hash = (37 * hash) + DATA_FIELD_NUMBER;
- hash = (53 * hash) + internalGetData().hashCode();
- }
- hash = (29 * hash) + unknownFields.hashCode();
- memoizedHashCode = hash;
- return hash;
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model parseFrom(
- com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model parseFrom(
- com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model parseFrom(byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model parseFrom(java.io.InputStream input)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model parseFrom(java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model parseDelimitedFrom(
- java.io.InputStream input) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model parseDelimitedFrom(
- java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input,
- extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model parseFrom(
- com.google.protobuf.CodedInputStream input) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model parseFrom(
- com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry);
- }
-
- public Builder newBuilderForType() {
- return newBuilder();
- }
-
- public static Builder newBuilder() {
- return DEFAULT_INSTANCE.toBuilder();
- }
-
- public static Builder newBuilder(com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model prototype) {
- return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- public Builder toBuilder() {
- return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
- }
-
- @java.lang.Override
- protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- Builder builder = new Builder(parent);
- return builder;
- }
-
- /**
- * Protobuf type {@code com.farsunset.cim.sdk.server.model.proto.Model}
- */
- public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements
- // @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.server.model.proto.Model)
- com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.ModelOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMapField(int number) {
- switch (number) {
- case 5:
- return internalGetData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
- switch (number) {
- case 5:
- return internalGetMutableData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model.class,
- com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model.Builder.class);
- }
-
- // Construct using
- // com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
-
- private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- super(parent);
- maybeForceBuilderInitialization();
- }
-
- private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
- }
- }
-
- public Builder clear() {
- super.clear();
- key_ = "";
-
- code_ = "";
-
- message_ = "";
-
- timestamp_ = 0L;
-
- internalGetMutableData().clear();
- return this;
- }
-
- public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
- return com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
- }
-
- public com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model getDefaultInstanceForType() {
- return com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model.getDefaultInstance();
- }
-
- public com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model build() {
- com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(result);
- }
- return result;
- }
-
- public com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model buildPartial() {
- com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model result = new com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model(
- this);
- int from_bitField0_ = bitField0_;
- int to_bitField0_ = 0;
- result.key_ = key_;
- result.code_ = code_;
- result.message_ = message_;
- result.timestamp_ = timestamp_;
- result.data_ = internalGetData();
- result.data_.makeImmutable();
- result.bitField0_ = to_bitField0_;
- onBuilt();
- return result;
- }
-
- public Builder clone() {
- return (Builder) super.clone();
- }
-
- public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
- return (Builder) super.setField(field, value);
- }
-
- public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
- return (Builder) super.clearField(field);
- }
-
- public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
- return (Builder) super.clearOneof(oneof);
- }
-
- public Builder setRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, int index,
- Object value) {
- return (Builder) super.setRepeatedField(field, index, value);
- }
-
- public Builder addRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
- return (Builder) super.addRepeatedField(field, value);
- }
-
- public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model) {
- return mergeFrom((com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model) other);
- } else {
- super.mergeFrom(other);
- return this;
- }
- }
-
- public Builder mergeFrom(com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model other) {
- if (other == com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model.getDefaultInstance())
- return this;
- if (!other.getKey().isEmpty()) {
- key_ = other.key_;
- onChanged();
- }
- if (!other.getCode().isEmpty()) {
- code_ = other.code_;
- onChanged();
- }
- if (!other.getMessage().isEmpty()) {
- message_ = other.message_;
- onChanged();
- }
- if (other.getTimestamp() != 0L) {
- setTimestamp(other.getTimestamp());
- }
- internalGetMutableData().mergeFrom(other.internalGetData());
- onChanged();
- return this;
- }
-
- public final boolean isInitialized() {
- return true;
- }
-
- public Builder mergeFrom(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
- com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model parsedMessage = null;
- try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model) e
- .getUnfinishedMessage();
- throw e.unwrapIOException();
- } finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
- return this;
- }
-
- private int bitField0_;
-
- private java.lang.Object key_ = "";
-
- /**
- * string key = 1;
- */
- public java.lang.String getKey() {
- java.lang.Object ref = key_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- key_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
-
- /**
- * string key = 1;
- */
- public com.google.protobuf.ByteString getKeyBytes() {
- java.lang.Object ref = key_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString
- .copyFromUtf8((java.lang.String) ref);
- key_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- /**
- * string key = 1;
- */
- public Builder setKey(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
-
- key_ = value;
- onChanged();
- return this;
- }
-
- /**
- * string key = 1;
- */
- public Builder clearKey() {
-
- key_ = getDefaultInstance().getKey();
- onChanged();
- return this;
- }
-
- /**
- * string key = 1;
- */
- public Builder setKeyBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
-
- key_ = value;
- onChanged();
- return this;
- }
-
- private java.lang.Object code_ = "";
-
- /**
- * string code = 2;
- */
- public java.lang.String getCode() {
- java.lang.Object ref = code_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- code_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
-
- /**
- * string code = 2;
- */
- public com.google.protobuf.ByteString getCodeBytes() {
- java.lang.Object ref = code_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString
- .copyFromUtf8((java.lang.String) ref);
- code_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- /**
- * string code = 2;
- */
- public Builder setCode(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
-
- code_ = value;
- onChanged();
- return this;
- }
-
- /**
- * string code = 2;
- */
- public Builder clearCode() {
-
- code_ = getDefaultInstance().getCode();
- onChanged();
- return this;
- }
-
- /**
- * string code = 2;
- */
- public Builder setCodeBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
-
- code_ = value;
- onChanged();
- return this;
- }
-
- private java.lang.Object message_ = "";
-
- /**
- * string message = 3;
- */
- public java.lang.String getMessage() {
- java.lang.Object ref = message_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- message_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
-
- /**
- * string message = 3;
- */
- public com.google.protobuf.ByteString getMessageBytes() {
- java.lang.Object ref = message_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString
- .copyFromUtf8((java.lang.String) ref);
- message_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- /**
- * string message = 3;
- */
- public Builder setMessage(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
-
- message_ = value;
- onChanged();
- return this;
- }
-
- /**
- * string message = 3;
- */
- public Builder clearMessage() {
-
- message_ = getDefaultInstance().getMessage();
- onChanged();
- return this;
- }
-
- /**
- * string message = 3;
- */
- public Builder setMessageBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
-
- message_ = value;
- onChanged();
- return this;
- }
-
- private long timestamp_;
-
- /**
- * int64 timestamp = 4;
- */
- public long getTimestamp() {
- return timestamp_;
- }
-
- /**
- * int64 timestamp = 4;
- */
- public Builder setTimestamp(long value) {
-
- timestamp_ = value;
- onChanged();
- return this;
- }
-
- /**
- * int64 timestamp = 4;
- */
- public Builder clearTimestamp() {
-
- timestamp_ = 0L;
- onChanged();
- return this;
- }
-
- private com.google.protobuf.MapField data_;
-
- private com.google.protobuf.MapField internalGetData() {
- if (data_ == null) {
- return com.google.protobuf.MapField.emptyMapField(DataDefaultEntryHolder.defaultEntry);
- }
- return data_;
- }
-
- private com.google.protobuf.MapField internalGetMutableData() {
- onChanged();
- ;
- if (data_ == null) {
- data_ = com.google.protobuf.MapField.newMapField(DataDefaultEntryHolder.defaultEntry);
- }
- if (!data_.isMutable()) {
- data_ = data_.copy();
- }
- return data_;
- }
-
- public int getDataCount() {
- return internalGetData().getMap().size();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public boolean containsData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- return internalGetData().getMap().containsKey(key);
- }
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- public java.util.Map getData() {
- return getDataMap();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.util.Map getDataMap() {
- return internalGetData().getMap();
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- return map.containsKey(key) ? map.get(key) : defaultValue;
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public java.lang.String getDataOrThrow(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
- }
- return map.get(key);
- }
-
- public Builder clearData() {
- internalGetMutableData().getMutableMap().clear();
- return this;
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public Builder removeData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- internalGetMutableData().getMutableMap().remove(key);
- return this;
- }
-
- /**
- * Use alternate mutation accessors instead.
- */
- @java.lang.Deprecated
- public java.util.Map getMutableData() {
- return internalGetMutableData().getMutableMap();
- }
-
- /**
- * map<string, string> data = 5;
- */
- public Builder putData(java.lang.String key, java.lang.String value) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- if (value == null) {
- throw new java.lang.NullPointerException();
- }
- internalGetMutableData().getMutableMap().put(key, value);
- return this;
- }
-
- /**
- * map<string, string> data = 5;
- */
-
- public Builder putAllData(java.util.Map values) {
- internalGetMutableData().getMutableMap().putAll(values);
- return this;
- }
-
- public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- public final Builder mergeUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- // @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.server.model.proto.Model)
- }
-
- // @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.server.model.proto.Model)
- private static final com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model DEFAULT_INSTANCE;
- static {
- DEFAULT_INSTANCE = new com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model();
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model getDefaultInstance() {
- return DEFAULT_INSTANCE;
- }
-
- private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() {
- public Model parsePartialFrom(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return new Model(input, extensionRegistry);
- }
- };
-
- public static com.google.protobuf.Parser parser() {
- return PARSER;
- }
-
- @java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
- return PARSER;
- }
-
- public com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto.Model getDefaultInstanceForType() {
- return DEFAULT_INSTANCE;
- }
-
- }
-
- private static final com.google.protobuf.Descriptors.Descriptor internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
- private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable;
- private static final com.google.protobuf.Descriptors.Descriptor internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_descriptor;
- private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_fieldAccessorTable;
-
- public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
- return descriptor;
- }
-
- private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
- static {
- java.lang.String[] descriptorData = { "\n\017ReplyBody.proto\022(com.farsunset.cim.sdk"
- + ".server.model.proto\"\274\001\n\005Model\022\013\n\003key\030\001 \001"
- + "(\t\022\014\n\004code\030\002 \001(\t\022\017\n\007message\030\003 \001(\t\022\021\n\ttim"
- + "estamp\030\004 \001(\003\022G\n\004data\030\005 \003(\01329.com.farsuns"
- + "et.cim.sdk.server.model.proto.Model.Data"
- + "Entry\032+\n\tDataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value"
- + "\030\002 \001(\t:\0028\001B\020B\016ReplyBodyProtob\006proto3" };
- com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- return null;
- }
- };
- com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData,
- new com.google.protobuf.Descriptors.FileDescriptor[] {}, assigner);
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor = getDescriptor().getMessageTypes()
- .get(0);
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor,
- new java.lang.String[] { "Key", "Code", "Message", "Timestamp", "Data", });
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_descriptor = internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor
- .getNestedTypes().get(0);
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_descriptor,
- new java.lang.String[] { "Key", "Value", });
- }
-
- // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/proto/SentBodyProto.java b/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/proto/SentBodyProto.java
deleted file mode 100644
index bf53d62..0000000
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/proto/SentBodyProto.java
+++ /dev/null
@@ -1,934 +0,0 @@
-/**
- * Copyright 2013-2019 Xia Jun(3979434@qq.com).
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ***************************************************************************************
- * *
- * Website : http://www.farsunset.com *
- * *
- ***************************************************************************************
- */
-package com.farsunset.cim.sdk.server.model.proto;
-
-public final class SentBodyProto {
- private SentBodyProto() {
- }
-
- public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {
- }
-
- public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {
- registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
- }
-
- public interface ModelOrBuilder extends
- // @@protoc_insertion_point(interface_extends:com.farsunset.cim.sdk.server.model.proto.Model)
- com.google.protobuf.MessageOrBuilder {
-
- /**
- * string key = 1;
- */
- java.lang.String getKey();
-
- /**
- * string key = 1;
- */
- com.google.protobuf.ByteString getKeyBytes();
-
- /**
- * int64 timestamp = 2;
- */
- long getTimestamp();
-
- /**
- * map<string, string> data = 3;
- */
- int getDataCount();
-
- /**
- * map<string, string> data = 3;
- */
- boolean containsData(java.lang.String key);
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- java.util.Map getData();
-
- /**
- * map<string, string> data = 3;
- */
- java.util.Map getDataMap();
-
- /**
- * map<string, string> data = 3;
- */
-
- java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue);
-
- /**
- * map<string, string> data = 3;
- */
-
- java.lang.String getDataOrThrow(java.lang.String key);
- }
-
- /**
- * Protobuf type {@code com.farsunset.cim.sdk.server.model.proto.Model}
- */
- public static final class Model extends com.google.protobuf.GeneratedMessageV3 implements
- // @@protoc_insertion_point(message_implements:com.farsunset.cim.sdk.server.model.proto.Model)
- ModelOrBuilder {
- // Use Model.newBuilder() to construct.
- private Model(com.google.protobuf.GeneratedMessageV3.Builder builder) {
- super(builder);
- }
-
- private Model() {
- key_ = "";
- timestamp_ = 0L;
- }
-
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
- return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
- }
-
- private Model(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- this();
- int mutable_bitField0_ = 0;
- try {
- boolean done = false;
- while (!done) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- done = true;
- break;
- default: {
- if (!input.skipField(tag)) {
- done = true;
- }
- break;
- }
- case 10: {
- java.lang.String s = input.readStringRequireUtf8();
-
- key_ = s;
- break;
- }
- case 16: {
-
- timestamp_ = input.readInt64();
- break;
- }
- case 26: {
- if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
- data_ = com.google.protobuf.MapField.newMapField(DataDefaultEntryHolder.defaultEntry);
- mutable_bitField0_ |= 0x00000004;
- }
- com.google.protobuf.MapEntry data__ = input
- .readMessage(DataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
- data_.getMutableMap().put(data__.getKey(), data__.getValue());
- break;
- }
- }
- }
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw e.setUnfinishedMessage(this);
- } catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
- } finally {
- makeExtensionsImmutable();
- }
- }
-
- public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return com.farsunset.cim.sdk.server.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMapField(int number) {
- switch (number) {
- case 3:
- return internalGetData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.server.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable
- .ensureFieldAccessorsInitialized(com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model.class,
- com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model.Builder.class);
- }
-
- private int bitField0_;
- public static final int KEY_FIELD_NUMBER = 1;
- private volatile java.lang.Object key_;
-
- /**
- * string key = 1;
- */
- public java.lang.String getKey() {
- java.lang.Object ref = key_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- key_ = s;
- return s;
- }
- }
-
- /**
- * string key = 1;
- */
- public com.google.protobuf.ByteString getKeyBytes() {
- java.lang.Object ref = key_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- key_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- public static final int TIMESTAMP_FIELD_NUMBER = 2;
- private long timestamp_;
-
- /**
- * int64 timestamp = 2;
- */
- public long getTimestamp() {
- return timestamp_;
- }
-
- public static final int DATA_FIELD_NUMBER = 3;
-
- private static final class DataDefaultEntryHolder {
- static final com.google.protobuf.MapEntry defaultEntry = com.google.protobuf.MapEntry.newDefaultInstance(
- com.farsunset.cim.sdk.server.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_descriptor,
- com.google.protobuf.WireFormat.FieldType.STRING, "",
- com.google.protobuf.WireFormat.FieldType.STRING, "");
- }
-
- private com.google.protobuf.MapField data_;
-
- private com.google.protobuf.MapField internalGetData() {
- if (data_ == null) {
- return com.google.protobuf.MapField.emptyMapField(DataDefaultEntryHolder.defaultEntry);
- }
- return data_;
- }
-
- public int getDataCount() {
- return internalGetData().getMap().size();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public boolean containsData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- return internalGetData().getMap().containsKey(key);
- }
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- public java.util.Map getData() {
- return getDataMap();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.util.Map getDataMap() {
- return internalGetData().getMap();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- return map.containsKey(key) ? map.get(key) : defaultValue;
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.lang.String getDataOrThrow(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
- }
- return map.get(key);
- }
-
- private byte memoizedIsInitialized = -1;
-
- public final boolean isInitialized() {
- byte isInitialized = memoizedIsInitialized;
- if (isInitialized == 1)
- return true;
- if (isInitialized == 0)
- return false;
-
- memoizedIsInitialized = 1;
- return true;
- }
-
- public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (!getKeyBytes().isEmpty()) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 1, key_);
- }
- if (timestamp_ != 0L) {
- output.writeInt64(2, timestamp_);
- }
- com.google.protobuf.GeneratedMessageV3.serializeStringMapTo(output, internalGetData(),
- DataDefaultEntryHolder.defaultEntry, 3);
- }
-
- public int getSerializedSize() {
- int size = memoizedSize;
- if (size != -1)
- return size;
-
- size = 0;
- if (!getKeyBytes().isEmpty()) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, key_);
- }
- if (timestamp_ != 0L) {
- size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, timestamp_);
- }
- for (java.util.Map.Entry entry : internalGetData().getMap()
- .entrySet()) {
- com.google.protobuf.MapEntry data__ = DataDefaultEntryHolder.defaultEntry
- .newBuilderForType().setKey(entry.getKey()).setValue(entry.getValue()).build();
- size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, data__);
- }
- memoizedSize = size;
- return size;
- }
-
- private static final long serialVersionUID = 0L;
-
- @java.lang.Override
- public boolean equals(final java.lang.Object obj) {
- if (obj == this) {
- return true;
- }
- if (!(obj instanceof com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model)) {
- return super.equals(obj);
- }
- com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model other = (com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model) obj;
-
- boolean result = true;
- result = result && getKey().equals(other.getKey());
- result = result && (getTimestamp() == other.getTimestamp());
- result = result && internalGetData().equals(other.internalGetData());
- return result;
- }
-
- @java.lang.Override
- public int hashCode() {
- if (memoizedHashCode != 0) {
- return memoizedHashCode;
- }
- int hash = 41;
- hash = (19 * hash) + getDescriptor().hashCode();
- hash = (37 * hash) + KEY_FIELD_NUMBER;
- hash = (53 * hash) + getKey().hashCode();
- hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
- hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getTimestamp());
- if (!internalGetData().getMap().isEmpty()) {
- hash = (37 * hash) + DATA_FIELD_NUMBER;
- hash = (53 * hash) + internalGetData().hashCode();
- }
- hash = (29 * hash) + unknownFields.hashCode();
- memoizedHashCode = hash;
- return hash;
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model parseFrom(
- com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model parseFrom(
- com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model parseFrom(byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model parseFrom(java.io.InputStream input)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model parseFrom(java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model parseDelimitedFrom(
- java.io.InputStream input) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model parseDelimitedFrom(
- java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input,
- extensionRegistry);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model parseFrom(
- com.google.protobuf.CodedInputStream input) throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model parseFrom(
- com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry);
- }
-
- public Builder newBuilderForType() {
- return newBuilder();
- }
-
- public static Builder newBuilder() {
- return DEFAULT_INSTANCE.toBuilder();
- }
-
- public static Builder newBuilder(com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model prototype) {
- return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
-
- public Builder toBuilder() {
- return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
- }
-
- @java.lang.Override
- protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- Builder builder = new Builder(parent);
- return builder;
- }
-
- /**
- * Protobuf type {@code com.farsunset.cim.sdk.server.model.proto.Model}
- */
- public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements
- // @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.server.model.proto.Model)
- com.farsunset.cim.sdk.server.model.proto.SentBodyProto.ModelOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
- return com.farsunset.cim.sdk.server.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMapField(int number) {
- switch (number) {
- case 3:
- return internalGetData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- @SuppressWarnings({ "rawtypes" })
- protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
- switch (number) {
- case 3:
- return internalGetMutableData();
- default:
- throw new RuntimeException("Invalid map field number: " + number);
- }
- }
-
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.server.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model.class,
- com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model.Builder.class);
- }
-
- // Construct using
- // com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
-
- private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- super(parent);
- maybeForceBuilderInitialization();
- }
-
- private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
- }
- }
-
- public Builder clear() {
- super.clear();
- key_ = "";
-
- timestamp_ = 0L;
-
- internalGetMutableData().clear();
- return this;
- }
-
- public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
- return com.farsunset.cim.sdk.server.model.proto.SentBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
- }
-
- public com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model getDefaultInstanceForType() {
- return com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model.getDefaultInstance();
- }
-
- public com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model build() {
- com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(result);
- }
- return result;
- }
-
- public com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model buildPartial() {
- com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model result = new com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model(
- this);
- int from_bitField0_ = bitField0_;
- int to_bitField0_ = 0;
- result.key_ = key_;
- result.timestamp_ = timestamp_;
- result.data_ = internalGetData();
- result.data_.makeImmutable();
- result.bitField0_ = to_bitField0_;
- onBuilt();
- return result;
- }
-
- public Builder clone() {
- return (Builder) super.clone();
- }
-
- public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
- return (Builder) super.setField(field, value);
- }
-
- public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
- return (Builder) super.clearField(field);
- }
-
- public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
- return (Builder) super.clearOneof(oneof);
- }
-
- public Builder setRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, int index,
- Object value) {
- return (Builder) super.setRepeatedField(field, index, value);
- }
-
- public Builder addRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, Object value) {
- return (Builder) super.addRepeatedField(field, value);
- }
-
- public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model) {
- return mergeFrom((com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model) other);
- } else {
- super.mergeFrom(other);
- return this;
- }
- }
-
- public Builder mergeFrom(com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model other) {
- if (other == com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model.getDefaultInstance())
- return this;
- if (!other.getKey().isEmpty()) {
- key_ = other.key_;
- onChanged();
- }
- if (other.getTimestamp() != 0L) {
- setTimestamp(other.getTimestamp());
- }
- internalGetMutableData().mergeFrom(other.internalGetData());
- onChanged();
- return this;
- }
-
- public final boolean isInitialized() {
- return true;
- }
-
- public Builder mergeFrom(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException {
- com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model parsedMessage = null;
- try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model) e
- .getUnfinishedMessage();
- throw e.unwrapIOException();
- } finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
- return this;
- }
-
- private int bitField0_;
-
- private java.lang.Object key_ = "";
-
- /**
- * string key = 1;
- */
- public java.lang.String getKey() {
- java.lang.Object ref = key_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- key_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
-
- /**
- * string key = 1;
- */
- public com.google.protobuf.ByteString getKeyBytes() {
- java.lang.Object ref = key_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b = com.google.protobuf.ByteString
- .copyFromUtf8((java.lang.String) ref);
- key_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- /**
- * string key = 1;
- */
- public Builder setKey(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
-
- key_ = value;
- onChanged();
- return this;
- }
-
- /**
- * string key = 1;
- */
- public Builder clearKey() {
-
- key_ = getDefaultInstance().getKey();
- onChanged();
- return this;
- }
-
- /**
- * string key = 1;
- */
- public Builder setKeyBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
-
- key_ = value;
- onChanged();
- return this;
- }
-
- private long timestamp_;
-
- /**
- * int64 timestamp = 2;
- */
- public long getTimestamp() {
- return timestamp_;
- }
-
- /**
- * int64 timestamp = 2;
- */
- public Builder setTimestamp(long value) {
-
- timestamp_ = value;
- onChanged();
- return this;
- }
-
- /**
- * int64 timestamp = 2;
- */
- public Builder clearTimestamp() {
-
- timestamp_ = 0L;
- onChanged();
- return this;
- }
-
- private com.google.protobuf.MapField data_;
-
- private com.google.protobuf.MapField internalGetData() {
- if (data_ == null) {
- return com.google.protobuf.MapField.emptyMapField(DataDefaultEntryHolder.defaultEntry);
- }
- return data_;
- }
-
- private com.google.protobuf.MapField internalGetMutableData() {
- onChanged();
- ;
- if (data_ == null) {
- data_ = com.google.protobuf.MapField.newMapField(DataDefaultEntryHolder.defaultEntry);
- }
- if (!data_.isMutable()) {
- data_ = data_.copy();
- }
- return data_;
- }
-
- public int getDataCount() {
- return internalGetData().getMap().size();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public boolean containsData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- return internalGetData().getMap().containsKey(key);
- }
-
- /**
- * Use {@link #getDataMap()} instead.
- */
- @java.lang.Deprecated
- public java.util.Map getData() {
- return getDataMap();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.util.Map getDataMap() {
- return internalGetData().getMap();
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.lang.String getDataOrDefault(java.lang.String key, java.lang.String defaultValue) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- return map.containsKey(key) ? map.get(key) : defaultValue;
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public java.lang.String getDataOrThrow(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- java.util.Map map = internalGetData().getMap();
- if (!map.containsKey(key)) {
- throw new java.lang.IllegalArgumentException();
- }
- return map.get(key);
- }
-
- public Builder clearData() {
- internalGetMutableData().getMutableMap().clear();
- return this;
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public Builder removeData(java.lang.String key) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- internalGetMutableData().getMutableMap().remove(key);
- return this;
- }
-
- /**
- * Use alternate mutation accessors instead.
- */
- @java.lang.Deprecated
- public java.util.Map getMutableData() {
- return internalGetMutableData().getMutableMap();
- }
-
- /**
- * map<string, string> data = 3;
- */
- public Builder putData(java.lang.String key, java.lang.String value) {
- if (key == null) {
- throw new java.lang.NullPointerException();
- }
- if (value == null) {
- throw new java.lang.NullPointerException();
- }
- internalGetMutableData().getMutableMap().put(key, value);
- return this;
- }
-
- /**
- * map<string, string> data = 3;
- */
-
- public Builder putAllData(java.util.Map values) {
- internalGetMutableData().getMutableMap().putAll(values);
- return this;
- }
-
- public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- public final Builder mergeUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
- return this;
- }
-
- // @@protoc_insertion_point(builder_scope:com.farsunset.cim.sdk.server.model.proto.Model)
- }
-
- // @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.server.model.proto.Model)
- private static final com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model DEFAULT_INSTANCE;
- static {
- DEFAULT_INSTANCE = new com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model();
- }
-
- public static com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model getDefaultInstance() {
- return DEFAULT_INSTANCE;
- }
-
- private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() {
- public Model parsePartialFrom(com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return new Model(input, extensionRegistry);
- }
- };
-
- public static com.google.protobuf.Parser parser() {
- return PARSER;
- }
-
- @java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
- return PARSER;
- }
-
- public com.farsunset.cim.sdk.server.model.proto.SentBodyProto.Model getDefaultInstanceForType() {
- return DEFAULT_INSTANCE;
- }
-
- }
-
- private static final com.google.protobuf.Descriptors.Descriptor internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
- private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable;
- private static final com.google.protobuf.Descriptors.Descriptor internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_descriptor;
- private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_fieldAccessorTable;
-
- public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
- return descriptor;
- }
-
- private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
- static {
- java.lang.String[] descriptorData = { "\n\016SentBody.proto\022(com.farsunset.cim.sdk."
- + "server.model.proto\"\235\001\n\005Model\022\013\n\003key\030\001 \001("
- + "\t\022\021\n\ttimestamp\030\002 \001(\003\022G\n\004data\030\003 \003(\01329.com"
- + ".farsunset.cim.sdk.server.model.proto.Mo"
- + "del.DataEntry\032+\n\tDataEntry\022\013\n\003key\030\001 \001(\t\022"
- + "\r\n\005value\030\002 \001(\t:\0028\001B\017B\rSentBodyProtob\006pro" + "to3" };
- com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- return null;
- }
- };
- com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(descriptorData,
- new com.google.protobuf.Descriptors.FileDescriptor[] {}, assigner);
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor = getDescriptor().getMessageTypes()
- .get(0);
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor,
- new java.lang.String[] { "Key", "Timestamp", "Data", });
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_descriptor = internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor
- .getNestedTypes().get(0);
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_com_farsunset_cim_sdk_server_model_proto_Model_DataEntry_descriptor,
- new java.lang.String[] { "Key", "Value", });
- }
-
- // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/ServerMessageCodecFactory.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageCodecFactory.java
similarity index 74%
rename from cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/ServerMessageCodecFactory.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageCodecFactory.java
index aa57da6..819c60e 100644
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/ServerMessageCodecFactory.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageCodecFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
* *
***************************************************************************************
*/
-package com.farsunset.cim.sdk.server.filter;
+package com.farsunset.cim.sdk.server.coder;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
@@ -29,22 +29,24 @@ import org.apache.mina.filter.codec.ProtocolEncoder;
/**
* 服务端消息 编码解码器
*/
-public class ServerMessageCodecFactory implements ProtocolCodecFactory {
+public class AppMessageCodecFactory implements ProtocolCodecFactory {
- private final ServerMessageEncoder encoder;
+ private final AppMessageEncoder encoder;
- private final ServerMessageDecoder decoder;
+ private final AppMessageDecoder decoder;
- public ServerMessageCodecFactory() {
- encoder = new ServerMessageEncoder();
- decoder = new ServerMessageDecoder();
+ public AppMessageCodecFactory() {
+ encoder = new AppMessageEncoder();
+ decoder = new AppMessageDecoder();
}
- public ProtocolEncoder getEncoder(IoSession session) throws Exception {
+ @Override
+ public ProtocolEncoder getEncoder(IoSession session) {
return encoder;
}
- public ProtocolDecoder getDecoder(IoSession session) throws Exception {
+ @Override
+ public ProtocolDecoder getDecoder(IoSession session) {
return decoder;
}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageDecoder.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageDecoder.java
new file mode 100644
index 0000000..ae52d17
--- /dev/null
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageDecoder.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2013-2019 Xia Jun(3979434@qq.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ***************************************************************************************
+ * *
+ * Website : http://www.farsunset.com *
+ * *
+ ***************************************************************************************
+ */
+package com.farsunset.cim.sdk.server.coder;
+
+
+import com.farsunset.cim.sdk.server.constant.CIMConstant;
+import com.farsunset.cim.sdk.server.model.HeartbeatResponse;
+import com.farsunset.cim.sdk.server.model.SentBody;
+import com.farsunset.cim.sdk.server.model.proto.SentBodyProto;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolDecoderAdapter;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+
+/**
+ * 原生app发送的消息解码器
+ */
+public class AppMessageDecoder extends ProtocolDecoderAdapter {
+
+
+ @Override
+ public void decode(IoSession session, IoBuffer iobuffer, ProtocolDecoderOutput out) throws Exception {
+
+
+ if (iobuffer.remaining() < CIMConstant.DATA_HEADER_LENGTH) {
+ return;
+ }
+
+ iobuffer.mark();
+
+ byte type = iobuffer.get();
+ byte lv = iobuffer.get();
+ byte hv = iobuffer.get();
+
+ int length = getContentLength(lv, hv);
+
+ /*
+ *发生了断包情况如果消息体没有接收完整，则重置读取，等待下一次重新读取
+ */
+ if (length > iobuffer.remaining()) {
+ iobuffer.reset();
+ return;
+ }
+
+ byte[] dataBytes = new byte[length];
+ iobuffer.get(dataBytes, 0, length);
+
+ Object message = mappingMessageObject(dataBytes, type);
+ out.write(message);
+ }
+
+ public Object mappingMessageObject(byte[] data, byte type) throws Exception {
+
+ if (CIMConstant.ProtobufType.C_H_RS == type) {
+ return HeartbeatResponse.getInstance();
+ }
+
+ SentBodyProto.Model bodyProto = SentBodyProto.Model.parseFrom(data);
+ SentBody body = new SentBody();
+ body.setKey(bodyProto.getKey());
+ body.setTimestamp(bodyProto.getTimestamp());
+ body.putAll(bodyProto.getDataMap());
+ return body;
+ }
+
+ /**
+ * 解析消息体长度
+ * @return
+ */
+ private int getContentLength(byte lv, byte hv) {
+ int l = (lv & 0xff);
+ int h = (hv & 0xff);
+ return (l | h << 8);
+ }
+
+}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageEncoder.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageEncoder.java
new file mode 100644
index 0000000..71b4a6c
--- /dev/null
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/AppMessageEncoder.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013-2019 Xia Jun(3979434@qq.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ***************************************************************************************
+ * *
+ * Website : http://www.farsunset.com *
+ * *
+ ***************************************************************************************
+ */
+package com.farsunset.cim.sdk.server.coder;
+
+import com.farsunset.cim.sdk.server.constant.CIMConstant;
+import com.farsunset.cim.sdk.server.model.Transportable;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
+
+/**
+ * 服务端发送消息前编码
+ */
+public class AppMessageEncoder extends ProtocolEncoderAdapter {
+
+
+ @Override
+ public void encode(IoSession iosession, Object object, ProtocolEncoderOutput out) {
+
+ Transportable message = (Transportable) object;
+ byte[] data = message.getBody();
+
+ IoBuffer buff = IoBuffer.allocate(data.length + CIMConstant.DATA_HEADER_LENGTH).setAutoExpand(true);
+ buff.put(createHeader(message.getType(), data.length));
+ buff.put(data);
+
+ buff.flip();
+ out.write(buff);
+ }
+
+ /**
+ * 消息体最大为65535
+ * @param type
+ * @param length
+ * @return
+ */
+ private byte[] createHeader(byte type, int length) {
+ byte[] header = new byte[CIMConstant.DATA_HEADER_LENGTH];
+ header[0] = type;
+ header[1] = (byte) (length & 0xff);
+ header[2] = (byte) ((length >> 8) & 0xff);
+ return header;
+ }
+
+}
diff --git a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/HandshakerResponse.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageCodecFactory.java
similarity index 60%
rename from cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/HandshakerResponse.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageCodecFactory.java
index b71cd50..4e30470 100644
--- a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/HandshakerResponse.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageCodecFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,37 +19,35 @@
* *
***************************************************************************************
*/
-package com.farsunset.cim.sdk.server.model;
+package com.farsunset.cim.sdk.server.coder;
+
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolEncoder;
/**
- * websocket握手响应结果
- *
+ * 服务端消息 编码解码器
*/
-public class HandshakerResponse {
+public class WebMessageCodecFactory implements ProtocolCodecFactory {
- private String token;
+ private final WebMessageEncoder encoder;
- public HandshakerResponse(String token) {
- this.token = token;
- }
+ private final WebMessageDecoder decoder;
- public byte[] getBytes() {
- return toString().getBytes();
+ public WebMessageCodecFactory() {
+ encoder = new WebMessageEncoder();
+ decoder = new WebMessageDecoder();
}
@Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("HTTP/1.1 101 Switching Protocols");
- builder.append("\r\n");
- builder.append("Upgrade: websocket");
- builder.append("\r\n");
- builder.append("Connection: Upgrade");
- builder.append("\r\n");
- builder.append("Sec-WebSocket-Accept:").append(token);
- builder.append("\r\n");
- builder.append("\r\n");
- return builder.toString();
-
+ public ProtocolEncoder getEncoder(IoSession session) {
+ return encoder;
}
+
+ @Override
+ public ProtocolDecoder getDecoder(IoSession session) {
+ return decoder;
+ }
+
}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/decoder/WebMessageDecoder.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageDecoder.java
similarity index 60%
rename from cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/decoder/WebMessageDecoder.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageDecoder.java
index 1dc7d5e..abb48a3 100644
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/filter/decoder/WebMessageDecoder.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageDecoder.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,145 +19,124 @@
* *
***************************************************************************************
*/
-package com.farsunset.cim.sdk.server.filter.decoder;
+package com.farsunset.cim.sdk.server.coder;
+
+import com.farsunset.cim.sdk.server.constant.CIMConstant;
+import com.farsunset.cim.sdk.server.model.SentBody;
+import com.farsunset.cim.sdk.server.model.proto.SentBodyProto;
+import com.google.protobuf.InvalidProtocolBufferException;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolDecoderAdapter;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-import org.apache.mina.filter.codec.demux.MessageDecoderAdapter;
-import org.apache.mina.filter.codec.demux.MessageDecoderResult;
-import com.farsunset.cim.sdk.server.constant.CIMConstant;
-import com.farsunset.cim.sdk.server.model.HeartbeatResponse;
-import com.farsunset.cim.sdk.server.model.SentBody;
-import com.farsunset.cim.sdk.server.model.proto.SentBodyProto;
-import com.farsunset.cim.sdk.server.model.CIMSession;
-import com.google.protobuf.InvalidProtocolBufferException;
-
/**
* Websocket协议消息解码
*/
-public class WebMessageDecoder extends MessageDecoderAdapter {
- public static final byte MASK = 0x1;// 1000 0000
+public class WebMessageDecoder extends ProtocolDecoderAdapter {
+ public static final byte MASK = 0x1;
public static final byte HAS_EXTEND_DATA = 126;
public static final byte HAS_EXTEND_DATA_CONTINUE = 127;
- public static final byte PAYLOADLEN = 0x7F;// 0111 1111
+ public static final byte PAYLOADLEN = 0x7F;
- public static final byte TAG_MASK = 0x0F;// 0000 1111 > 15
-
+ public static final byte TAG_MASK = 0x0F;
private static final byte OPCODE_BINARY = 0x2;
private static final byte OPCODE_CLOSE = 0x8;
public static final Pattern SEC_KEY_PATTERN = Pattern.compile("^(Sec-WebSocket-Key:).+",Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
public static final Pattern UPGRADE_PATTERN = Pattern.compile("^(Upgrade:).+",Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
- public static final String HANDSHAKE_FRAME = "HANDSHAKE_FRAME";
+
+ private static final String SOURCE = "source";
+ private static final String WEBSOCKET = "websocket";
@Override
- public MessageDecoderResult decodable(IoSession arg0, IoBuffer iobuffer) {
+ public void decode(IoSession iosession, IoBuffer in, ProtocolDecoderOutput out) throws InvalidProtocolBufferException{
- /**
- * 如果是Websocket客户端，则不作处理，由WebMessageDecoder进行处理
- */
- if(Objects.equals(arg0.getAttribute(CIMSession.PROTOCOL), CIMSession.WEBSOCKET)) {
- return OK;
- }
-
- if(Objects.equals(arg0.getAttribute(CIMSession.PROTOCOL), CIMSession.NATIVEAPP)) {
- return NOT_OK;
- }
-
- /**
- * 判断是否是websocket连接发送的数据
- */
- String data = new String(iobuffer.array());
- boolean handShake = getSecWebSocketKey(data) != null && Objects.equals(getUpgradeProtocol(data),CIMSession.WEBSOCKET);
- if(handShake) {
- arg0.setAttribute(HANDSHAKE_FRAME, handShake);
- return OK;
- }
-
- return NOT_OK;
- }
-
- @Override
- public MessageDecoderResult decode(IoSession iosession, IoBuffer in, ProtocolDecoderOutput out) throws InvalidProtocolBufferException{
-
- /**
+ /*
* 判断是否是握手请求
*/
- if(Objects.equals(iosession.getAttribute(HANDSHAKE_FRAME), true)) {
-
- handleHandshake(iosession,in, out);
- return OK;
+ if(isHandShakeRequest(iosession,in)) {
+ handleHandshake(iosession,in, out);
+ return;
}
-
+
in.mark();
- /**
+ /*
* 接下来判断fin标志位是否是1 如果是0 则等待消息接收完成
*/
byte tag = in.get();
- int frameFin = tag > 0 ? 0 : 1; //有符号byte 第一位为1则为负数 第一位为0则为正数，以此 判断fin字段是 0 还是 1
+ int frameFin = tag > 0 ? 0 : 1;
if(frameFin == 0) {
in.reset();
- return NEED_DATA;
+ return;
}
- /**
+ /*
* 获取帧类型，因为使用了protobuf，所以只支持二进制帧 OPCODE_BINARY，以及客户端关闭连接帧通知 OPCODE_CLOSE
*/
- int frameOqcode = tag & TAG_MASK;
+ int frameCode = tag & TAG_MASK;
- if(OPCODE_BINARY == frameOqcode) {
+ if(OPCODE_BINARY == frameCode) {
byte head = in.get();
- byte datalength = (byte) (head & PAYLOADLEN);
- int realLength = 0;
+ byte dataLength = (byte) (head & PAYLOADLEN);
+ int realLength;
- /**
+ /*
*Payload len，7位或者7+16位或者7+64位，表示数据帧中数据大小，这里有好几种情况。
*如果值为0-125，那么该值就是payload data的真实长度。
*如果值为126，那么该7位后面紧跟着的2个字节就是payload data的真实长度。
*如果值为127，那么该7位后面紧跟着的8个字节就是payload data的真实长度。
*/
- if (datalength == HAS_EXTEND_DATA) {
+ if (dataLength == HAS_EXTEND_DATA) {
realLength = in.getShort();
- } else if (datalength == HAS_EXTEND_DATA_CONTINUE) {
+ } else if (dataLength == HAS_EXTEND_DATA_CONTINUE) {
realLength = (int) in.getLong();
}else {
- realLength = datalength;
+ realLength = dataLength;
}
boolean masked = (head >> 7 & MASK) == 1;
- if (masked) {// 有掩码
- // 获取掩码
+ if (masked) {
byte[] mask = new byte[4];
in.get(mask);
byte[] data = new byte[realLength];
in.get(data);
for (int i = 0; i < realLength; i++) {
- // 数据进行异或运算
data[i] = (byte) (data[i] ^ mask[i % 4]);
}
handleMessage(data,out);
}
- }else if(OPCODE_CLOSE == frameOqcode) {
+ }else if(OPCODE_CLOSE == frameCode) {
handleClose(iosession,in);
}else {
- //忽略其他类型的消息
in.get(new byte[in.remaining()]);
}
- return OK;
+ }
+
+ private boolean isHandShakeRequest(IoSession iosession, IoBuffer buffer){
+ if(Objects.equals(iosession.getAttribute(SOURCE),WEBSOCKET)) {
+ return false;
+ }
+
+ buffer.mark();
+ String data = new String(buffer.array());
+ boolean handShake = getSecWebSocketKey(data) != null && Objects.equals(getUpgradeProtocol(data),WEBSOCKET);
+ buffer.reset();
+ return handShake;
}
@@ -195,12 +174,10 @@ public class WebMessageDecoder extends MessageDecoderAdapter {
in.get(data);
String message = new String(data);
- /**
+ /*
* 重要，握手响应之后，删除标志HANDSHAKE_FRAME,并标记当前session的协议为websocket
*/
- iosession.removeAttribute(HANDSHAKE_FRAME);
- iosession.setAttribute(CIMSession.PROTOCOL,CIMSession.WEBSOCKET);
-
+ iosession.setAttribute(SOURCE,WEBSOCKET);
SentBody body = new SentBody();
body.setKey(CIMConstant.CLIENT_WEBSOCKET_HANDSHAKE);
body.setTimestamp(System.currentTimeMillis());
@@ -214,45 +191,14 @@ public class WebMessageDecoder extends MessageDecoderAdapter {
}
public void handleMessage(byte[] data, ProtocolDecoderOutput out) throws InvalidProtocolBufferException{
- byte type = data[0];
- /**
- * 只处理心跳响应以及，sentbody消息
- */
- if (type == CIMConstant.ProtobufType.C_H_RS) {
- HeartbeatResponse response = HeartbeatResponse.getInstance();
- out.write(response);
- }
-
- if (type == CIMConstant.ProtobufType.SENTBODY) {
-
- int length = getContentLength( data[1], data[2]);
- byte[] protobuf = new byte[length];
- System.arraycopy(data, CIMConstant.DATA_HEADER_LENGTH, protobuf, 0, length);
-
- SentBodyProto.Model bodyProto = SentBodyProto.Model.parseFrom(protobuf);
- SentBody body = new SentBody();
- body.setKey(bodyProto.getKey());
- body.setTimestamp(bodyProto.getTimestamp());
- body.putAll(bodyProto.getDataMap());
- out.write(body);
-
- }
+ SentBodyProto.Model bodyProto = SentBodyProto.Model.parseFrom(data);
+ SentBody body = new SentBody();
+ body.setKey(bodyProto.getKey());
+ body.setTimestamp(bodyProto.getTimestamp());
+ body.putAll(bodyProto.getDataMap());
+ out.write(body);
}
-
- /**
- * 解析消息体长度
- *
- * @param type
- * @param length
- * @return
- */
- private int getContentLength(byte lv, byte hv) {
- int l = (lv & 0xff);
- int h = (hv & 0xff);
- return (l | (h <<= 8));
- }
-
}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageEncoder.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageEncoder.java
new file mode 100644
index 0000000..4e7b255
--- /dev/null
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/coder/WebMessageEncoder.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2013-2019 Xia Jun(3979434@qq.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ***************************************************************************************
+ * *
+ * Website : http://www.farsunset.com *
+ * *
+ ***************************************************************************************
+ */
+package com.farsunset.cim.sdk.server.coder;
+
+import com.farsunset.cim.sdk.server.model.HandshakerResponse;
+import com.farsunset.cim.sdk.server.model.Transportable;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
+
+/**
+ * 服务端发送消息前编码
+ */
+public class WebMessageEncoder extends ProtocolEncoderAdapter {
+
+
+ @Override
+ public void encode(IoSession iosession, Object object, ProtocolEncoderOutput out) throws Exception {
+
+
+ Transportable message = (Transportable) object;
+ byte[] data = message.getBody();
+
+ /*
+ * websocket的握手响应
+ */
+ if (message instanceof HandshakerResponse) {
+ IoBuffer buff = IoBuffer.allocate(data.length).setAutoExpand(true);
+ buff.put(data);
+ buff.flip();
+ out.write(buff);
+
+ return;
+ }
+
+ byte[] protobuf = new byte[data.length + 1];
+ protobuf[0] = message.getType();
+ System.arraycopy(data,0, protobuf, 1, data.length);
+
+ byte[] binaryFrame = encodeDataFrame(protobuf);
+ IoBuffer buffer = IoBuffer.allocate(binaryFrame.length);
+ buffer.put(binaryFrame);
+ buffer.flip();
+ out.write(buffer);
+
+
+ }
+
+ /**
+ * 发送到websocket的数据需要进行相关格式转换 对传入数据进行无掩码转换
+ *
+ * @param data
+ * @return
+ */
+ public static byte[] encodeDataFrame(byte[] data) {
+ // 掩码开始位置
+ int maskIndex;
+
+ // 计算掩码开始位置
+ if (data.length <= 125) {
+ maskIndex = 2;
+ } else if (data.length > 65536) {
+ maskIndex = 10;
+ } else {
+ maskIndex = 4;
+ }
+
+ // 创建返回数据
+ byte[] result = new byte[data.length + maskIndex];
+
+ /*
+ 0x82 二进制帧 0x80 文本帧
+ */
+ result[0] = (byte) 0x82;
+
+ if (data.length <= 125) {
+ result[1] = (byte) (data.length);
+ } else if (data.length > 65536) {
+ result[1] = 0x7F;
+ } else {
+ result[1] = 0x7E;
+ result[2] = (byte) (data.length >> 8);
+ result[3] = (byte) (data.length % 256);
+ }
+
+ // 将数据编码放到最后
+ System.arraycopy(data, 0, result, maskIndex, data.length);
+
+ return result;
+ }
+
+}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/constant/CIMConstant.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/constant/CIMConstant.java
similarity index 75%
rename from cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/constant/CIMConstant.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/constant/CIMConstant.java
index b4c6299..93aba4a 100644
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/constant/CIMConstant.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/constant/CIMConstant.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,21 +25,11 @@ package com.farsunset.cim.sdk.server.constant;
* 常量
*/
public interface CIMConstant {
- // 消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度
+ /**
+ 消息头长度为3个字节，第一个字节为消息类型，第二，第三字节 转换int后为消息长度
+ */
int DATA_HEADER_LENGTH = 3;
- public static interface ReturnCode {
-
- String CODE_200 = "200";
-
- String CODE_404 = "404";
-
- String CODE_403 = "403";
-
- String CODE_500 = "500";
-
- }
-
String KEY_ACCOUNT = "account";
String KEY_QUIETLY_CLOSE = "quietlyClose";
@@ -48,17 +38,20 @@ public interface CIMConstant {
String CLIENT_CONNECT_CLOSED = "client_closed";
- public static interface ProtobufType {
+ interface ProtobufType {
byte S_H_RQ = 1;
byte C_H_RS = 0;
byte MESSAGE = 2;
- byte SENTBODY = 3;
- byte REPLYBODY = 4;
+ byte SENT_BODY = 3;
+ byte REPLY_BODY = 4;
}
- public static interface MessageAction {
- // 被其他设备登录挤下线消息
- String ACTION_999 = "999";
+ interface MessageAction {
+ /*
+ 内置消息类型
+ 被其他设备登录挤下线消息
+ */
+ String ACTION_OFFLINE = "999";
}
}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java
new file mode 100644
index 0000000..090b5b1
--- /dev/null
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/CIMNioSocketAcceptor.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright 2013-2019 Xia Jun(3979434@qq.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ***************************************************************************************
+ * *
+ * Website : http://www.farsunset.com *
+ * *
+ ***************************************************************************************
+ */
+package com.farsunset.cim.sdk.server.handler;
+
+import com.farsunset.cim.sdk.server.coder.AppMessageCodecFactory;
+import com.farsunset.cim.sdk.server.coder.WebMessageCodecFactory;
+import com.farsunset.cim.sdk.server.constant.CIMConstant;
+import com.farsunset.cim.sdk.server.model.CIMSession;
+import com.farsunset.cim.sdk.server.model.HeartbeatRequest;
+import com.farsunset.cim.sdk.server.model.HeartbeatResponse;
+import com.farsunset.cim.sdk.server.model.SentBody;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.filter.executor.ExecutorFilter;
+import org.apache.mina.filter.keepalive.KeepAliveFilter;
+import org.apache.mina.filter.keepalive.KeepAliveMessageFactory;
+import org.apache.mina.filter.logging.LoggingFilter;
+import org.apache.mina.transport.socket.DefaultSocketSessionConfig;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.HashMap;
+import java.util.concurrent.*;
+
+public class CIMNioSocketAcceptor extends IoHandlerAdapter implements KeepAliveMessageFactory {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CIMNioSocketAcceptor.class);
+ private static final HashMap INNER_HANDLER_MAP = new HashMap<>();
+
+ /**
+ * 读写空闲2分钟后 服务端 -> 客户端 发起心跳请求
+ */
+ private static final int IDLE_HEART_REQUEST_TIME = 120;
+
+ /**
+ * 发起心跳后等待客户端的心跳响应，超时10秒后断开连接
+ */
+ private static final int HEART_RESPONSE_TIME_OUT = 10;
+
+ private IoAcceptor appAcceptor;
+ private IoAcceptor webAcceptor;
+ private final Integer appPort;
+ private final Integer webPort;
+ private final CIMRequestHandler outerRequestHandler;
+
+ private CIMNioSocketAcceptor(Builder builder){
+ this.webPort = builder.webPort;
+ this.appPort = builder.appPort;
+ this.outerRequestHandler = builder.outerRequestHandler;
+ }
+
+ public void bind() {
+
+ if (appPort != null){
+ try {
+ bindAppPort();
+ } catch (IOException e) {
+ LOGGER.error("App port bind error.",e);
+ }
+ }
+
+ if (webPort != null){
+ try {
+ bindWebPort();
+ } catch (IOException e) {
+ LOGGER.error("Web port bind error.",e);
+ }
+ }
+ }
+
+ private void bindAppPort() throws IOException {
+
+
+ appAcceptor = new NioSocketAcceptor();
+ ((DefaultSocketSessionConfig) appAcceptor.getSessionConfig()).setKeepAlive(true);
+ ((DefaultSocketSessionConfig) appAcceptor.getSessionConfig()).setTcpNoDelay(true);
+
+ KeepAliveFilter keepAliveFilter = new KeepAliveFilter(this, IdleStatus.BOTH_IDLE);
+ keepAliveFilter.setRequestInterval(IDLE_HEART_REQUEST_TIME);
+ keepAliveFilter.setRequestTimeout(HEART_RESPONSE_TIME_OUT);
+ keepAliveFilter.setForwardEvent(true);
+
+ appAcceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(new AppMessageCodecFactory()));
+ appAcceptor.getFilterChain().addLast("logger", new LoggingFilter());
+ appAcceptor.getFilterChain().addLast("heartbeat", keepAliveFilter);
+ appAcceptor.getFilterChain().addLast("executor", new ExecutorFilter(createWorkerExecutor()));
+ appAcceptor.setHandler(this);
+
+ appAcceptor.bind(new InetSocketAddress(appPort));
+ String logBanner = "\n\n" +
+ "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n" +
+ "* *\n" +
+ "* *\n" +
+ "* App Socket Server started on port {}. *\n" +
+ "* *\n" +
+ "* *\n" +
+ "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n";
+ LOGGER.info(logBanner, appPort);
+ }
+
+
+ private void bindWebPort() throws IOException {
+
+ /*
+ * 预制websocket握手请求的处理
+ */
+ INNER_HANDLER_MAP.put(CIMConstant.CLIENT_WEBSOCKET_HANDSHAKE, new WebsocketHandler());
+
+ webAcceptor = new NioSocketAcceptor();
+ ((DefaultSocketSessionConfig) webAcceptor.getSessionConfig()).setKeepAlive(true);
+ ((DefaultSocketSessionConfig) webAcceptor.getSessionConfig()).setTcpNoDelay(true);
+ webAcceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(new WebMessageCodecFactory()));
+ webAcceptor.getFilterChain().addLast("logger", new LoggingFilter());
+ webAcceptor.getFilterChain().addLast("executor", new ExecutorFilter(createWorkerExecutor()));
+ webAcceptor.setHandler(this);
+
+ webAcceptor.bind(new InetSocketAddress(webPort));
+ String logBanner = "\n\n" +
+ "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n" +
+ "* *\n" +
+ "* *\n" +
+ "* Websocket Server started on port {}. *\n" +
+ "* *\n" +
+ "* *\n" +
+ "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n";
+ LOGGER.info(logBanner, webPort);
+ }
+
+
+ private Executor createWorkerExecutor(){
+ int coreSize = Runtime.getRuntime().availableProcessors() * 2;
+
+ return new ThreadPoolExecutor(coreSize,coreSize,60, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), runnable -> {
+ Thread thread = Executors.defaultThreadFactory().newThread(runnable);
+ thread.setName("mina-thread-" + thread.getId());
+ return thread;
+ });
+ }
+
+ public void destroy() {
+ if(webAcceptor != null) {
+ webAcceptor.unbind();
+ webAcceptor.dispose();
+ }
+
+ if(appAcceptor != null) {
+ appAcceptor.unbind();
+ appAcceptor.dispose();
+ }
+ }
+
+
+ @Override
+ public void messageReceived(IoSession ios, Object message) {
+
+ SentBody body = (SentBody) message;
+ CIMSession session = new CIMSession(ios);
+
+ CIMRequestHandler handler = INNER_HANDLER_MAP.get(body.getKey());
+ /*
+ * 如果有内置的特殊handler需要处理，则使用内置的
+ */
+ if (handler != null) {
+ handler.process(session, body);
+ return ;
+ }
+
+ /*
+ * 有业务层去处理其他的sentBody
+ */
+ outerRequestHandler.process(session, body);
+ }
+
+ @Override
+ public void sessionClosed(IoSession ios) {
+
+ CIMSession session = new CIMSession(ios);
+ SentBody body = new SentBody();
+ body.setKey(CIMConstant.CLIENT_CONNECT_CLOSED);
+ outerRequestHandler.process(session, body);
+ }
+
+ @Override
+ public Object getRequest(IoSession session) {
+ return HeartbeatRequest.getInstance();
+ }
+
+ @Override
+ public Object getResponse(IoSession arg0, Object arg1) {
+ return null;
+ }
+
+ @Override
+ public boolean isRequest(IoSession arg0, Object arg1) {
+ return false;
+ }
+
+ @Override
+ public boolean isResponse(IoSession arg0, Object arg1) {
+ return arg1 instanceof HeartbeatResponse;
+ }
+
+
+ public IoSession getManagedSession(String nid) {
+ if (nid == null) {
+ return null;
+ }
+
+ long id = Long.parseLong(nid);
+
+ IoSession session = appAcceptor == null ? null : appAcceptor.getManagedSessions().get(id);
+
+ if (session != null){
+ return session;
+ }
+
+ return webAcceptor == null ? null :webAcceptor.getManagedSessions().get(id);
+ }
+
+ public static class Builder{
+
+ private Integer appPort;
+ private Integer webPort;
+ private CIMRequestHandler outerRequestHandler;
+
+ public Builder setAppPort(Integer appPort) {
+ this.appPort = appPort;
+ return this;
+ }
+
+ public Builder setWebsocketPort(Integer port) {
+ this.webPort = port;
+ return this;
+ }
+
+ /**
+ * 设置应用层的sentBody处理handler
+ */
+ public Builder setOuterRequestHandler(CIMRequestHandler outerRequestHandler) {
+ this.outerRequestHandler = outerRequestHandler;
+ return this;
+ }
+
+ public CIMNioSocketAcceptor build(){
+ return new CIMNioSocketAcceptor(this);
+ }
+
+ }
+
+}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/CIMRequestHandler.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/CIMRequestHandler.java
similarity index 92%
rename from cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/CIMRequestHandler.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/CIMRequestHandler.java
index 0f49b39..c6fa04c 100644
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/CIMRequestHandler.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/CIMRequestHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,14 +21,16 @@
*/
package com.farsunset.cim.sdk.server.handler;
-/**
- * 请求处理接口,所有的请求实现必须实现此接口
- * @author 3979434@qq.com
- */
-import com.farsunset.cim.sdk.server.model.SentBody;
+
import com.farsunset.cim.sdk.server.model.CIMSession;
+import com.farsunset.cim.sdk.server.model.SentBody;
public interface CIMRequestHandler {
+ /**
+ * 处理长连接发送的请求
+ * @param session
+ * @param message
+ */
void process(CIMSession session, SentBody message);
}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/WebsocketHandler.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/WebsocketHandler.java
similarity index 87%
rename from cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/WebsocketHandler.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/WebsocketHandler.java
index 7e53c76..e60962a 100644
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/handler/WebsocketHandler.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/handler/WebsocketHandler.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,11 +21,13 @@
*/
package com.farsunset.cim.sdk.server.handler;
-import java.security.MessageDigest;
-
-import com.farsunset.cim.sdk.server.model.SentBody;
-import com.farsunset.cim.sdk.server.model.HandshakerResponse;
import com.farsunset.cim.sdk.server.model.CIMSession;
+import com.farsunset.cim.sdk.server.model.HandshakerResponse;
+import com.farsunset.cim.sdk.server.model.SentBody;
+import org.apache.mina.util.Base64;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
/**
* 处理websocket握手请求，返回响应的报文给浏览器
@@ -34,15 +36,16 @@ public class WebsocketHandler implements CIMRequestHandler {
private final static String GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+ @Override
public void process(CIMSession session, SentBody body) {
session.setChannel(CIMSession.CHANNEL_BROWSER);
String secKey = body.get("key") + GUID;
try {
MessageDigest md = MessageDigest.getInstance("SHA-1");
- md.update(secKey.getBytes("iso-8859-1"), 0, secKey.length());
+ md.update(secKey.getBytes(StandardCharsets.ISO_8859_1), 0, secKey.length());
byte[] sha1Hash = md.digest();
- secKey = new String(org.apache.mina.util.Base64.encodeBase64(sha1Hash));
+
+ session.write(new HandshakerResponse(new String(Base64.encodeBase64(sha1Hash))));
} catch (Exception ignore) {}
- session.write(new HandshakerResponse(secKey));
}
}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/CIMSession.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/CIMSession.java
similarity index 92%
rename from cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/CIMSession.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/CIMSession.java
index a7bc122..4ad4aa6 100644
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/CIMSession.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/CIMSession.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,16 +21,14 @@
*/
package com.farsunset.cim.sdk.server.model;
-import java.io.Serializable;
-import java.net.SocketAddress;
-import java.util.Objects;
-
-import org.apache.mina.core.future.WriteFuture;
-import org.apache.mina.core.session.IoSession;
-
import com.farsunset.cim.sdk.server.constant.CIMConstant;
import com.farsunset.cim.sdk.server.model.proto.SessionProto;
import com.google.protobuf.InvalidProtocolBufferException;
+import org.apache.mina.core.session.IoSession;
+
+import java.io.Serializable;
+import java.net.SocketAddress;
+import java.util.Objects;
/**
* IoSession包装类,集群时 将此对象存入表中
@@ -39,10 +37,6 @@ public class CIMSession implements Serializable {
private transient static final long serialVersionUID = 1L;
- public transient static String PROTOCOL = "protocol";
- public transient static String WEBSOCKET = "websocket";
- public transient static String NATIVEAPP = "nativeapp";
-
public transient static String HOST = "HOST";
public transient static final int STATE_ENABLED = 0;
public transient static final int STATE_DISABLED = 1;
@@ -56,77 +50,77 @@ public class CIMSession implements Serializable {
private transient IoSession session;
- /*
+ /**
* 数据库主键ID
*/
private Long id;
- /*
+ /**
* session绑定的用户账号
*/
private String account;
- /*
+ /**
* session在本台服务器上的ID
*/
private String nid;
- /*
- * 客户端ID (设备号码+应用包名),ios为devicetoken
+ /**
+ * 客户端ID (设备号码+应用包名),ios为deviceToken
*/
private String deviceId;
- /*
+ /**
* session绑定的服务器IP
*/
private String host;
- /*
+ /**
* 终端设备类型
*/
private String channel;
- /*
+ /**
* 终端设备型号
*/
private String deviceModel;
- /*
+ /**
* 终端应用版本
*/
private String clientVersion;
- /*
+ /**
* 终端系统版本
*/
private String systemVersion;
- /*
+ /**
* 登录时间
*/
private Long bindTime;
- /*
+ /**
* 经度
*/
private Double longitude;
- /*
+ /**
* 维度
*/
private Double latitude;
- /*
+ /**
* 位置
*/
private String location;
- /*
- * apns推送状态
+ /**
+ * APNs推送状态
*/
private int apns;
- /*
+ /**
* 状态
*/
private int state;
@@ -273,41 +267,42 @@ public class CIMSession implements Serializable {
}
public void setAttribute(String key, Object value) {
- if (session != null)
+ if (session != null) {
session.setAttribute(key, value);
+ }
}
public boolean containsAttribute(String key) {
- if (session != null)
+ if (session != null) {
return session.containsAttribute(key);
+ }
return false;
}
public Object getAttribute(String key) {
- if (session != null)
+ if (session != null) {
return session.getAttribute(key);
+ }
return null;
}
public void removeAttribute(String key) {
- if (session != null)
+ if (session != null) {
session.removeAttribute(key);
+ }
}
public SocketAddress getRemoteAddress() {
- if (session != null)
+ if (session != null) {
return session.getRemoteAddress();
+ }
return null;
}
- public boolean write(Object msg) {
- if (session != null) {
- WriteFuture future = session.write(msg);
- future.awaitUninterruptibly(10 * 1000);
- return future.isWritten();
+ public void write(Transportable data) {
+ if (session != null && session.isConnected()) {
+ session.write(data);
}
-
- return false;
}
public boolean isConnected() {
@@ -315,13 +310,15 @@ public class CIMSession implements Serializable {
}
public void closeNow() {
- if (session != null)
+ if (session != null) {
session.closeNow();
+ }
}
public void closeOnFlush() {
- if (session != null)
+ if (session != null) {
session.closeOnFlush();
+ }
}
public boolean isIOSChannel() {
@@ -336,7 +333,7 @@ public class CIMSession implements Serializable {
return Objects.equals(channel, CHANNEL_WINDOWS);
}
- public boolean isApnsOpend() {
+ public boolean isApnsEnable() {
return Objects.equals(apns, APNS_ON);
}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/HandshakerResponse.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HandshakerResponse.java
similarity index 91%
rename from cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/HandshakerResponse.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HandshakerResponse.java
index 9df31e4..2d93c7e 100644
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/HandshakerResponse.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HandshakerResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +26,7 @@ package com.farsunset.cim.sdk.server.model;
* websocket握手响应结果
*
*/
-public class HandshakerResponse {
+public class HandshakerResponse implements Transportable {
private String token;
@@ -34,7 +34,8 @@ public class HandshakerResponse {
this.token = token;
}
- public byte[] getBytes() {
+ @Override
+ public byte[] getBody() {
return toString().getBytes();
}
@@ -54,4 +55,9 @@ public class HandshakerResponse {
return builder.toString();
}
+
+ @Override
+ public byte getType() {
+ return -1;
+ }
}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/HeartbeatRequest.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HeartbeatRequest.java
similarity index 89%
rename from cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/HeartbeatRequest.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HeartbeatRequest.java
index c663f4b..180683e 100644
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/HeartbeatRequest.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HeartbeatRequest.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,15 +21,15 @@
*/
package com.farsunset.cim.sdk.server.model;
-import java.io.Serializable;
import com.farsunset.cim.sdk.server.constant.CIMConstant;
-import com.farsunset.cim.sdk.server.model.feature.EncodeFormatable;
+
+import java.io.Serializable;
/**
* 服务端心跳请求
*
*/
-public class HeartbeatRequest implements Serializable, EncodeFormatable {
+public class HeartbeatRequest implements Serializable, Transportable {
private static final long serialVersionUID = 1L;
private static final String TAG = "SERVER_HEARTBEAT_REQUEST";
@@ -46,16 +46,17 @@ public class HeartbeatRequest implements Serializable, EncodeFormatable {
}
@Override
- public byte[] getProtobufBody() {
+ public byte[] getBody() {
return CMD_HEARTBEAT_RESPONSE.getBytes();
}
+ @Override
public String toString() {
return TAG;
}
@Override
- public byte getDataType() {
+ public byte getType() {
return CIMConstant.ProtobufType.S_H_RQ;
}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/HeartbeatResponse.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HeartbeatResponse.java
similarity index 96%
rename from cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/HeartbeatResponse.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HeartbeatResponse.java
index 7a5e2ad..e45e978 100644
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/HeartbeatResponse.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/HeartbeatResponse.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +30,6 @@ public class HeartbeatResponse implements Serializable {
private static final long serialVersionUID = 1L;
private static final String TAG = "CLIENT_HEARTBEAT_RESPONSE";
- public static final String CMD_HEARTBEAT_RESPONSE = "CR";
private static HeartbeatResponse object = new HeartbeatResponse();
private HeartbeatResponse() {
@@ -40,6 +39,7 @@ public class HeartbeatResponse implements Serializable {
return object;
}
+ @Override
public String toString() {
return TAG;
}
diff --git a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/Message.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/Message.java
similarity index 95%
rename from cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/Message.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/Message.java
index 0c90bd0..4bb2420 100644
--- a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/Message.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/Message.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,15 +21,15 @@
*/
package com.farsunset.cim.sdk.server.model;
-import java.io.Serializable;
import com.farsunset.cim.sdk.server.constant.CIMConstant;
-import com.farsunset.cim.sdk.server.model.feature.EncodeFormatable;
import com.farsunset.cim.sdk.server.model.proto.MessageProto;
+import java.io.Serializable;
+
/**
* 消息对象
*/
-public class Message implements Serializable, EncodeFormatable {
+public class Message implements Serializable, Transportable {
private static final long serialVersionUID = 1L;
@@ -172,7 +172,7 @@ public class Message implements Serializable, EncodeFormatable {
}
@Override
- public byte[] getProtobufBody() {
+ public byte[] getBody() {
MessageProto.Model.Builder builder = MessageProto.Model.newBuilder();
builder.setId(id);
builder.setAction(action);
@@ -199,7 +199,7 @@ public class Message implements Serializable, EncodeFormatable {
}
@Override
- public byte getDataType() {
+ public byte getType() {
return CIMConstant.ProtobufType.MESSAGE;
}
}
diff --git a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/ReplyBody.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/ReplyBody.java
similarity index 87%
rename from cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/ReplyBody.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/ReplyBody.java
index d35b00d..5630ef9 100644
--- a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/ReplyBody.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/ReplyBody.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,20 +21,19 @@
*/
package com.farsunset.cim.sdk.server.model;
+import com.farsunset.cim.sdk.server.constant.CIMConstant;
+import com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto;
+
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import com.farsunset.cim.sdk.server.constant.CIMConstant;
-import com.farsunset.cim.sdk.server.model.feature.EncodeFormatable;
-import com.farsunset.cim.sdk.server.model.proto.ReplyBodyProto;
-
/**
* 请求应答对象
*
*/
-public class ReplyBody implements Serializable, EncodeFormatable {
+public class ReplyBody implements Serializable, Transportable {
private static final long serialVersionUID = 1L;
@@ -117,6 +116,9 @@ public class ReplyBody implements Serializable, EncodeFormatable {
public void setCode(String code) {
this.code = code;
}
+ public void setCode(int code) {
+ this.code = String.valueOf(code);
+ }
@Override
public String toString() {
@@ -126,19 +128,17 @@ public class ReplyBody implements Serializable, EncodeFormatable {
buffer.append("timestamp:").append(timestamp).append("\n");
buffer.append("code:").append(code).append("\n");
- if (!data.isEmpty()) {
- buffer.append("data{").append("\n");
- for (String key : getKeySet()) {
- buffer.append(key).append(":").append(this.get(key)).append("\n");
- }
- buffer.append("}");
+ buffer.append("data:{");
+ for (String key : getKeySet()) {
+ buffer.append("\n").append(key).append(":").append(this.get(key));
}
+ buffer.append("}");
return buffer.toString();
}
@Override
- public byte[] getProtobufBody() {
+ public byte[] getBody() {
ReplyBodyProto.Model.Builder builder = ReplyBodyProto.Model.newBuilder();
builder.setCode(code);
if (message != null) {
@@ -154,8 +154,8 @@ public class ReplyBody implements Serializable, EncodeFormatable {
}
@Override
- public byte getDataType() {
- return CIMConstant.ProtobufType.REPLYBODY;
+ public byte getType() {
+ return CIMConstant.ProtobufType.REPLY_BODY;
}
}
diff --git a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/SentBody.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/SentBody.java
similarity index 88%
rename from cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/SentBody.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/SentBody.java
index 8a148b2..ed4e37f 100644
--- a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/SentBody.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/SentBody.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,6 +48,14 @@ public class SentBody implements Serializable {
return data.get(k);
}
+ public int getInt(String k) {
+ return Integer.parseInt(data.get(k));
+ }
+
+ public long getLong(String k) {
+ return Long.parseLong(data.get(k));
+ }
+
public long getTimestamp() {
return timestamp;
}
@@ -86,13 +94,11 @@ public class SentBody implements Serializable {
buffer.append("key:").append(key).append("\n");
buffer.append("timestamp:").append(timestamp).append("\n");
- if (!data.isEmpty()) {
- buffer.append("data{").append("\n");
- for (String key : getKeySet()) {
- buffer.append(key).append(":").append(this.get(key)).append("\n");
- }
- buffer.append("}");
+ buffer.append("data:{");
+ for (String key : getKeySet()) {
+ buffer.append("\n").append(key).append(":").append(this.get(key));
}
+ buffer.append("}");
return buffer.toString();
}
diff --git a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/feature/EncodeFormatable.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/Transportable.java
similarity index 84%
rename from cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/feature/EncodeFormatable.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/Transportable.java
index 5ef9d5f..ef165f8 100644
--- a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/feature/EncodeFormatable.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/Transportable.java
@@ -1,4 +1,4 @@
-/**
+/*
* Copyright 2013-2019 Xia Jun(3979434@qq.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,13 +19,21 @@
* *
***************************************************************************************
*/
-package com.farsunset.cim.sdk.server.model.feature;
+package com.farsunset.cim.sdk.server.model;
/**
* 需要向另一端发送的结构体
*/
-public interface EncodeFormatable {
- byte[] getProtobufBody();
+public interface Transportable {
+ /**
+ * 消息体字节数组
+ * @return
+ */
+ byte[] getBody();
- byte getDataType();
+ /**
+ * 消息类型
+ * @return
+ */
+ byte getType();
}
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/proto/Message.proto b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/Message.proto
similarity index 100%
rename from cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/proto/Message.proto
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/Message.proto
diff --git a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/proto/MessageProto.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/MessageProto.java
similarity index 74%
rename from cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/proto/MessageProto.java
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/MessageProto.java
index bf807e3..5f8aa1c 100644
--- a/cim-server-sdk/cim-server-sdk-netty/src/com/farsunset/cim/sdk/server/model/proto/MessageProto.java
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/MessageProto.java
@@ -20,81 +20,97 @@ public final class MessageProto {
/**
* int64 id = 1;
+ * @return The id.
*/
long getId();
/**
* string action = 2;
+ * @return The action.
*/
- java.lang.String getAction();
+ String getAction();
/**
* string action = 2;
+ * @return The bytes for action.
*/
com.google.protobuf.ByteString
getActionBytes();
/**
* string content = 3;
+ * @return The content.
*/
- java.lang.String getContent();
+ String getContent();
/**
* string content = 3;
+ * @return The bytes for content.
*/
com.google.protobuf.ByteString
getContentBytes();
/**
* string sender = 4;
+ * @return The sender.
*/
- java.lang.String getSender();
+ String getSender();
/**
* string sender = 4;
+ * @return The bytes for sender.
*/
com.google.protobuf.ByteString
getSenderBytes();
/**
* string receiver = 5;
+ * @return The receiver.
*/
- java.lang.String getReceiver();
+ String getReceiver();
/**
* string receiver = 5;
+ * @return The bytes for receiver.
*/
com.google.protobuf.ByteString
getReceiverBytes();
/**
* string extra = 6;
+ * @return The extra.
*/
- java.lang.String getExtra();
+ String getExtra();
/**
* string extra = 6;
+ * @return The bytes for extra.
*/
com.google.protobuf.ByteString
getExtraBytes();
/**
* string title = 7;
+ * @return The title.
*/
- java.lang.String getTitle();
+ String getTitle();
/**
* string title = 7;
+ * @return The bytes for title.
*/
com.google.protobuf.ByteString
getTitleBytes();
/**
* string format = 8;
+ * @return The format.
*/
- java.lang.String getFormat();
+ String getFormat();
/**
* string format = 8;
+ * @return The bytes for format.
*/
com.google.protobuf.ByteString
getFormatBytes();
/**
* int64 timestamp = 9;
+ * @return The timestamp.
*/
long getTimestamp();
}
@@ -120,7 +136,14 @@ public final class MessageProto {
format_ = "";
}
- @java.lang.Override
+ @Override
+ @SuppressWarnings({"unused"})
+ protected Object newInstance(
+ UnusedPrivateParameter unused) {
+ return new Model();
+ }
+
+ @Override
public final com.google.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
@@ -131,9 +154,8 @@ public final class MessageProto {
throws com.google.protobuf.InvalidProtocolBufferException {
this();
if (extensionRegistry == null) {
- throw new java.lang.NullPointerException();
+ throw new NullPointerException();
}
- int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
try {
@@ -150,43 +172,43 @@ public final class MessageProto {
break;
}
case 18: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
action_ = s;
break;
}
case 26: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
content_ = s;
break;
}
case 34: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
sender_ = s;
break;
}
case 42: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
receiver_ = s;
break;
}
case 50: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
extra_ = s;
break;
}
case 58: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
title_ = s;
break;
}
case 66: {
- java.lang.String s = input.readStringRequireUtf8();
+ String s = input.readStringRequireUtf8();
format_ = s;
break;
@@ -217,53 +239,56 @@ public final class MessageProto {
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return com.farsunset.cim.sdk.server.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
+ return MessageProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
}
- @java.lang.Override
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ @Override
+ protected FieldAccessorTable
internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.server.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable
+ return MessageProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- com.farsunset.cim.sdk.server.model.proto.MessageProto.Model.class, com.farsunset.cim.sdk.server.model.proto.MessageProto.Model.Builder.class);
+ Model.class, Builder.class);
}
public static final int ID_FIELD_NUMBER = 1;
private long id_;
/**
* int64 id = 1;
+ * @return The id.
*/
public long getId() {
return id_;
}
public static final int ACTION_FIELD_NUMBER = 2;
- private volatile java.lang.Object action_;
+ private volatile Object action_;
/**
* string action = 2;
+ * @return The action.
*/
- public java.lang.String getAction() {
- java.lang.Object ref = action_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getAction() {
+ Object ref = action_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
action_ = s;
return s;
}
}
/**
* string action = 2;
+ * @return The bytes for action.
*/
public com.google.protobuf.ByteString
getActionBytes() {
- java.lang.Object ref = action_;
- if (ref instanceof java.lang.String) {
+ Object ref = action_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
action_ = b;
return b;
} else {
@@ -272,32 +297,34 @@ public final class MessageProto {
}
public static final int CONTENT_FIELD_NUMBER = 3;
- private volatile java.lang.Object content_;
+ private volatile Object content_;
/**
* string content = 3;
+ * @return The content.
*/
- public java.lang.String getContent() {
- java.lang.Object ref = content_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getContent() {
+ Object ref = content_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
content_ = s;
return s;
}
}
/**
* string content = 3;
+ * @return The bytes for content.
*/
public com.google.protobuf.ByteString
getContentBytes() {
- java.lang.Object ref = content_;
- if (ref instanceof java.lang.String) {
+ Object ref = content_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
content_ = b;
return b;
} else {
@@ -306,32 +333,34 @@ public final class MessageProto {
}
public static final int SENDER_FIELD_NUMBER = 4;
- private volatile java.lang.Object sender_;
+ private volatile Object sender_;
/**
* string sender = 4;
+ * @return The sender.
*/
- public java.lang.String getSender() {
- java.lang.Object ref = sender_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getSender() {
+ Object ref = sender_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
sender_ = s;
return s;
}
}
/**
* string sender = 4;
+ * @return The bytes for sender.
*/
public com.google.protobuf.ByteString
getSenderBytes() {
- java.lang.Object ref = sender_;
- if (ref instanceof java.lang.String) {
+ Object ref = sender_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
sender_ = b;
return b;
} else {
@@ -340,32 +369,34 @@ public final class MessageProto {
}
public static final int RECEIVER_FIELD_NUMBER = 5;
- private volatile java.lang.Object receiver_;
+ private volatile Object receiver_;
/**
* string receiver = 5;
+ * @return The receiver.
*/
- public java.lang.String getReceiver() {
- java.lang.Object ref = receiver_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getReceiver() {
+ Object ref = receiver_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
receiver_ = s;
return s;
}
}
/**
* string receiver = 5;
+ * @return The bytes for receiver.
*/
public com.google.protobuf.ByteString
getReceiverBytes() {
- java.lang.Object ref = receiver_;
- if (ref instanceof java.lang.String) {
+ Object ref = receiver_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
receiver_ = b;
return b;
} else {
@@ -374,32 +405,34 @@ public final class MessageProto {
}
public static final int EXTRA_FIELD_NUMBER = 6;
- private volatile java.lang.Object extra_;
+ private volatile Object extra_;
/**
* string extra = 6;
+ * @return The extra.
*/
- public java.lang.String getExtra() {
- java.lang.Object ref = extra_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getExtra() {
+ Object ref = extra_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
extra_ = s;
return s;
}
}
/**
* string extra = 6;
+ * @return The bytes for extra.
*/
public com.google.protobuf.ByteString
getExtraBytes() {
- java.lang.Object ref = extra_;
- if (ref instanceof java.lang.String) {
+ Object ref = extra_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
extra_ = b;
return b;
} else {
@@ -408,32 +441,34 @@ public final class MessageProto {
}
public static final int TITLE_FIELD_NUMBER = 7;
- private volatile java.lang.Object title_;
+ private volatile Object title_;
/**
* string title = 7;
+ * @return The title.
*/
- public java.lang.String getTitle() {
- java.lang.Object ref = title_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getTitle() {
+ Object ref = title_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
title_ = s;
return s;
}
}
/**
* string title = 7;
+ * @return The bytes for title.
*/
public com.google.protobuf.ByteString
getTitleBytes() {
- java.lang.Object ref = title_;
- if (ref instanceof java.lang.String) {
+ Object ref = title_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
title_ = b;
return b;
} else {
@@ -442,32 +477,34 @@ public final class MessageProto {
}
public static final int FORMAT_FIELD_NUMBER = 8;
- private volatile java.lang.Object format_;
+ private volatile Object format_;
/**
* string format = 8;
+ * @return The format.
*/
- public java.lang.String getFormat() {
- java.lang.Object ref = format_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
+ public String getFormat() {
+ Object ref = format_;
+ if (ref instanceof String) {
+ return (String) ref;
} else {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
format_ = s;
return s;
}
}
/**
* string format = 8;
+ * @return The bytes for format.
*/
public com.google.protobuf.ByteString
getFormatBytes() {
- java.lang.Object ref = format_;
- if (ref instanceof java.lang.String) {
+ Object ref = format_;
+ if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
format_ = b;
return b;
} else {
@@ -479,13 +516,14 @@ public final class MessageProto {
private long timestamp_;
/**
* int64 timestamp = 9;
+ * @return The timestamp.
*/
public long getTimestamp() {
return timestamp_;
}
private byte memoizedIsInitialized = -1;
- @java.lang.Override
+ @Override
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized == 1) return true;
@@ -495,7 +533,7 @@ public final class MessageProto {
return true;
}
- @java.lang.Override
+ @Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (id_ != 0L) {
@@ -528,7 +566,7 @@ public final class MessageProto {
unknownFields.writeTo(output);
}
- @java.lang.Override
+ @Override
public int getSerializedSize() {
int size = memoizedSize;
if (size != -1) return size;
@@ -568,15 +606,15 @@ public final class MessageProto {
return size;
}
- @java.lang.Override
- public boolean equals(final java.lang.Object obj) {
+ @Override
+ public boolean equals(final Object obj) {
if (obj == this) {
return true;
}
- if (!(obj instanceof com.farsunset.cim.sdk.server.model.proto.MessageProto.Model)) {
+ if (!(obj instanceof Model)) {
return super.equals(obj);
}
- com.farsunset.cim.sdk.server.model.proto.MessageProto.Model other = (com.farsunset.cim.sdk.server.model.proto.MessageProto.Model) obj;
+ Model other = (Model) obj;
if (getId()
!= other.getId()) return false;
@@ -600,7 +638,7 @@ public final class MessageProto {
return true;
}
- @java.lang.Override
+ @Override
public int hashCode() {
if (memoizedHashCode != 0) {
return memoizedHashCode;
@@ -632,69 +670,69 @@ public final class MessageProto {
return hash;
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
java.nio.ByteBuffer data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
java.nio.ByteBuffer data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseFrom(byte[] data)
+ public static Model parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseFrom(java.io.InputStream input)
+ public static Model parseFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input, extensionRegistry);
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseDelimitedFrom(java.io.InputStream input)
+ public static Model parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input);
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseDelimitedFrom(
+ public static Model parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseDelimitedWithIOException(PARSER, input, extensionRegistry);
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3
.parseWithIOException(PARSER, input);
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parseFrom(
+ public static Model parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -702,23 +740,23 @@ public final class MessageProto {
.parseWithIOException(PARSER, input, extensionRegistry);
}
- @java.lang.Override
+ @Override
public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder() {
return DEFAULT_INSTANCE.toBuilder();
}
- public static Builder newBuilder(com.farsunset.cim.sdk.server.model.proto.MessageProto.Model prototype) {
+ public static Builder newBuilder(Model prototype) {
return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
}
- @java.lang.Override
+ @Override
public Builder toBuilder() {
return this == DEFAULT_INSTANCE
? new Builder() : new Builder().mergeFrom(this);
}
- @java.lang.Override
+ @Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -728,18 +766,18 @@ public final class MessageProto {
public static final class Builder extends
com.google.protobuf.GeneratedMessageV3.Builder implements
// @@protoc_insertion_point(builder_implements:com.farsunset.cim.sdk.server.model.proto.Model)
- com.farsunset.cim.sdk.server.model.proto.MessageProto.ModelOrBuilder {
+ ModelOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return com.farsunset.cim.sdk.server.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
+ return MessageProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
}
- @java.lang.Override
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ @Override
+ protected FieldAccessorTable
internalGetFieldAccessorTable() {
- return com.farsunset.cim.sdk.server.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable
+ return MessageProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- com.farsunset.cim.sdk.server.model.proto.MessageProto.Model.class, com.farsunset.cim.sdk.server.model.proto.MessageProto.Model.Builder.class);
+ Model.class, Builder.class);
}
// Construct using com.farsunset.cim.sdk.server.model.proto.MessageProto.Model.newBuilder()
@@ -748,7 +786,7 @@ public final class MessageProto {
}
private Builder(
- com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@@ -757,7 +795,7 @@ public final class MessageProto {
.alwaysUseFieldBuilders) {
}
}
- @java.lang.Override
+ @Override
public Builder clear() {
super.clear();
id_ = 0L;
@@ -781,29 +819,29 @@ public final class MessageProto {
return this;
}
- @java.lang.Override
+ @Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return com.farsunset.cim.sdk.server.model.proto.MessageProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
+ return MessageProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
}
- @java.lang.Override
- public com.farsunset.cim.sdk.server.model.proto.MessageProto.Model getDefaultInstanceForType() {
- return com.farsunset.cim.sdk.server.model.proto.MessageProto.Model.getDefaultInstance();
+ @Override
+ public Model getDefaultInstanceForType() {
+ return Model.getDefaultInstance();
}
- @java.lang.Override
- public com.farsunset.cim.sdk.server.model.proto.MessageProto.Model build() {
- com.farsunset.cim.sdk.server.model.proto.MessageProto.Model result = buildPartial();
+ @Override
+ public Model build() {
+ Model result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- @java.lang.Override
- public com.farsunset.cim.sdk.server.model.proto.MessageProto.Model buildPartial() {
- com.farsunset.cim.sdk.server.model.proto.MessageProto.Model result = new com.farsunset.cim.sdk.server.model.proto.MessageProto.Model(this);
+ @Override
+ public Model buildPartial() {
+ Model result = new Model(this);
result.id_ = id_;
result.action_ = action_;
result.content_ = content_;
@@ -817,50 +855,50 @@ public final class MessageProto {
return result;
}
- @java.lang.Override
+ @Override
public Builder clone() {
return super.clone();
}
- @java.lang.Override
+ @Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- java.lang.Object value) {
+ Object value) {
return super.setField(field, value);
}
- @java.lang.Override
+ @Override
public Builder clearField(
com.google.protobuf.Descriptors.FieldDescriptor field) {
return super.clearField(field);
}
- @java.lang.Override
+ @Override
public Builder clearOneof(
com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return super.clearOneof(oneof);
}
- @java.lang.Override
+ @Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, java.lang.Object value) {
+ int index, Object value) {
return super.setRepeatedField(field, index, value);
}
- @java.lang.Override
+ @Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- java.lang.Object value) {
+ Object value) {
return super.addRepeatedField(field, value);
}
- @java.lang.Override
+ @Override
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof com.farsunset.cim.sdk.server.model.proto.MessageProto.Model) {
- return mergeFrom((com.farsunset.cim.sdk.server.model.proto.MessageProto.Model)other);
+ if (other instanceof Model) {
+ return mergeFrom((Model)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(com.farsunset.cim.sdk.server.model.proto.MessageProto.Model other) {
- if (other == com.farsunset.cim.sdk.server.model.proto.MessageProto.Model.getDefaultInstance()) return this;
+ public Builder mergeFrom(Model other) {
+ if (other == Model.getDefaultInstance()) return this;
if (other.getId() != 0L) {
setId(other.getId());
}
@@ -900,21 +938,21 @@ public final class MessageProto {
return this;
}
- @java.lang.Override
+ @Override
public final boolean isInitialized() {
return true;
}
- @java.lang.Override
+ @Override
public Builder mergeFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- com.farsunset.cim.sdk.server.model.proto.MessageProto.Model parsedMessage = null;
+ Model parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (com.farsunset.cim.sdk.server.model.proto.MessageProto.Model) e.getUnfinishedMessage();
+ parsedMessage = (Model) e.getUnfinishedMessage();
throw e.unwrapIOException();
} finally {
if (parsedMessage != null) {
@@ -927,12 +965,15 @@ public final class MessageProto {
private long id_ ;
/**
* int64 id = 1;
+ * @return The id.
*/
public long getId() {
return id_;
}
/**
* int64 id = 1;
+ * @param value The id to set.
+ * @return This builder for chaining.
*/
public Builder setId(long value) {
@@ -942,6 +983,7 @@ public final class MessageProto {
}
/**
* int64 id = 1;
+ * @return This builder for chaining.
*/
public Builder clearId() {
@@ -950,32 +992,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object action_ = "";
+ private Object action_ = "";
/**
* string action = 2;
+ * @return The action.
*/
- public java.lang.String getAction() {
- java.lang.Object ref = action_;
- if (!(ref instanceof java.lang.String)) {
+ public String getAction() {
+ Object ref = action_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
action_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string action = 2;
+ * @return The bytes for action.
*/
public com.google.protobuf.ByteString
getActionBytes() {
- java.lang.Object ref = action_;
+ Object ref = action_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
action_ = b;
return b;
} else {
@@ -984,9 +1028,11 @@ public final class MessageProto {
}
/**
* string action = 2;
+ * @param value The action to set.
+ * @return This builder for chaining.
*/
public Builder setAction(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -997,6 +1043,7 @@ public final class MessageProto {
}
/**
* string action = 2;
+ * @return This builder for chaining.
*/
public Builder clearAction() {
@@ -1006,6 +1053,8 @@ public final class MessageProto {
}
/**
* string action = 2;
+ * @param value The bytes for action to set.
+ * @return This builder for chaining.
*/
public Builder setActionBytes(
com.google.protobuf.ByteString value) {
@@ -1019,32 +1068,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object content_ = "";
+ private Object content_ = "";
/**
* string content = 3;
+ * @return The content.
*/
- public java.lang.String getContent() {
- java.lang.Object ref = content_;
- if (!(ref instanceof java.lang.String)) {
+ public String getContent() {
+ Object ref = content_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
content_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string content = 3;
+ * @return The bytes for content.
*/
public com.google.protobuf.ByteString
getContentBytes() {
- java.lang.Object ref = content_;
+ Object ref = content_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
content_ = b;
return b;
} else {
@@ -1053,9 +1104,11 @@ public final class MessageProto {
}
/**
* string content = 3;
+ * @param value The content to set.
+ * @return This builder for chaining.
*/
public Builder setContent(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1066,6 +1119,7 @@ public final class MessageProto {
}
/**
* string content = 3;
+ * @return This builder for chaining.
*/
public Builder clearContent() {
@@ -1075,6 +1129,8 @@ public final class MessageProto {
}
/**
* string content = 3;
+ * @param value The bytes for content to set.
+ * @return This builder for chaining.
*/
public Builder setContentBytes(
com.google.protobuf.ByteString value) {
@@ -1088,32 +1144,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object sender_ = "";
+ private Object sender_ = "";
/**
* string sender = 4;
+ * @return The sender.
*/
- public java.lang.String getSender() {
- java.lang.Object ref = sender_;
- if (!(ref instanceof java.lang.String)) {
+ public String getSender() {
+ Object ref = sender_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
sender_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string sender = 4;
+ * @return The bytes for sender.
*/
public com.google.protobuf.ByteString
getSenderBytes() {
- java.lang.Object ref = sender_;
+ Object ref = sender_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
sender_ = b;
return b;
} else {
@@ -1122,9 +1180,11 @@ public final class MessageProto {
}
/**
* string sender = 4;
+ * @param value The sender to set.
+ * @return This builder for chaining.
*/
public Builder setSender(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1135,6 +1195,7 @@ public final class MessageProto {
}
/**
* string sender = 4;
+ * @return This builder for chaining.
*/
public Builder clearSender() {
@@ -1144,6 +1205,8 @@ public final class MessageProto {
}
/**
* string sender = 4;
+ * @param value The bytes for sender to set.
+ * @return This builder for chaining.
*/
public Builder setSenderBytes(
com.google.protobuf.ByteString value) {
@@ -1157,32 +1220,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object receiver_ = "";
+ private Object receiver_ = "";
/**
* string receiver = 5;
+ * @return The receiver.
*/
- public java.lang.String getReceiver() {
- java.lang.Object ref = receiver_;
- if (!(ref instanceof java.lang.String)) {
+ public String getReceiver() {
+ Object ref = receiver_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
receiver_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string receiver = 5;
+ * @return The bytes for receiver.
*/
public com.google.protobuf.ByteString
getReceiverBytes() {
- java.lang.Object ref = receiver_;
+ Object ref = receiver_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
receiver_ = b;
return b;
} else {
@@ -1191,9 +1256,11 @@ public final class MessageProto {
}
/**
* string receiver = 5;
+ * @param value The receiver to set.
+ * @return This builder for chaining.
*/
public Builder setReceiver(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1204,6 +1271,7 @@ public final class MessageProto {
}
/**
* string receiver = 5;
+ * @return This builder for chaining.
*/
public Builder clearReceiver() {
@@ -1213,6 +1281,8 @@ public final class MessageProto {
}
/**
* string receiver = 5;
+ * @param value The bytes for receiver to set.
+ * @return This builder for chaining.
*/
public Builder setReceiverBytes(
com.google.protobuf.ByteString value) {
@@ -1226,32 +1296,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object extra_ = "";
+ private Object extra_ = "";
/**
* string extra = 6;
+ * @return The extra.
*/
- public java.lang.String getExtra() {
- java.lang.Object ref = extra_;
- if (!(ref instanceof java.lang.String)) {
+ public String getExtra() {
+ Object ref = extra_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
extra_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string extra = 6;
+ * @return The bytes for extra.
*/
public com.google.protobuf.ByteString
getExtraBytes() {
- java.lang.Object ref = extra_;
+ Object ref = extra_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
extra_ = b;
return b;
} else {
@@ -1260,9 +1332,11 @@ public final class MessageProto {
}
/**
* string extra = 6;
+ * @param value The extra to set.
+ * @return This builder for chaining.
*/
public Builder setExtra(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1273,6 +1347,7 @@ public final class MessageProto {
}
/**
* string extra = 6;
+ * @return This builder for chaining.
*/
public Builder clearExtra() {
@@ -1282,6 +1357,8 @@ public final class MessageProto {
}
/**
* string extra = 6;
+ * @param value The bytes for extra to set.
+ * @return This builder for chaining.
*/
public Builder setExtraBytes(
com.google.protobuf.ByteString value) {
@@ -1295,32 +1372,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object title_ = "";
+ private Object title_ = "";
/**
* string title = 7;
+ * @return The title.
*/
- public java.lang.String getTitle() {
- java.lang.Object ref = title_;
- if (!(ref instanceof java.lang.String)) {
+ public String getTitle() {
+ Object ref = title_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
title_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string title = 7;
+ * @return The bytes for title.
*/
public com.google.protobuf.ByteString
getTitleBytes() {
- java.lang.Object ref = title_;
+ Object ref = title_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
title_ = b;
return b;
} else {
@@ -1329,9 +1408,11 @@ public final class MessageProto {
}
/**
* string title = 7;
+ * @param value The title to set.
+ * @return This builder for chaining.
*/
public Builder setTitle(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1342,6 +1423,7 @@ public final class MessageProto {
}
/**
* string title = 7;
+ * @return This builder for chaining.
*/
public Builder clearTitle() {
@@ -1351,6 +1433,8 @@ public final class MessageProto {
}
/**
* string title = 7;
+ * @param value The bytes for title to set.
+ * @return This builder for chaining.
*/
public Builder setTitleBytes(
com.google.protobuf.ByteString value) {
@@ -1364,32 +1448,34 @@ public final class MessageProto {
return this;
}
- private java.lang.Object format_ = "";
+ private Object format_ = "";
/**
* string format = 8;
+ * @return The format.
*/
- public java.lang.String getFormat() {
- java.lang.Object ref = format_;
- if (!(ref instanceof java.lang.String)) {
+ public String getFormat() {
+ Object ref = format_;
+ if (!(ref instanceof String)) {
com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
+ String s = bs.toStringUtf8();
format_ = s;
return s;
} else {
- return (java.lang.String) ref;
+ return (String) ref;
}
}
/**
* string format = 8;
+ * @return The bytes for format.
*/
public com.google.protobuf.ByteString
getFormatBytes() {
- java.lang.Object ref = format_;
+ Object ref = format_;
if (ref instanceof String) {
com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
+ (String) ref);
format_ = b;
return b;
} else {
@@ -1398,9 +1484,11 @@ public final class MessageProto {
}
/**
* string format = 8;
+ * @param value The format to set.
+ * @return This builder for chaining.
*/
public Builder setFormat(
- java.lang.String value) {
+ String value) {
if (value == null) {
throw new NullPointerException();
}
@@ -1411,6 +1499,7 @@ public final class MessageProto {
}
/**
* string format = 8;
+ * @return This builder for chaining.
*/
public Builder clearFormat() {
@@ -1420,6 +1509,8 @@ public final class MessageProto {
}
/**
* string format = 8;
+ * @param value The bytes for format to set.
+ * @return This builder for chaining.
*/
public Builder setFormatBytes(
com.google.protobuf.ByteString value) {
@@ -1436,12 +1527,15 @@ public final class MessageProto {
private long timestamp_ ;
/**
* int64 timestamp = 9;
+ * @return The timestamp.
*/
public long getTimestamp() {
return timestamp_;
}
/**
* int64 timestamp = 9;
+ * @param value The timestamp to set.
+ * @return This builder for chaining.
*/
public Builder setTimestamp(long value) {
@@ -1451,6 +1545,7 @@ public final class MessageProto {
}
/**
* int64 timestamp = 9;
+ * @return This builder for chaining.
*/
public Builder clearTimestamp() {
@@ -1458,13 +1553,13 @@ public final class MessageProto {
onChanged();
return this;
}
- @java.lang.Override
+ @Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}
- @java.lang.Override
+ @Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
@@ -1475,18 +1570,18 @@ public final class MessageProto {
}
// @@protoc_insertion_point(class_scope:com.farsunset.cim.sdk.server.model.proto.Model)
- private static final com.farsunset.cim.sdk.server.model.proto.MessageProto.Model DEFAULT_INSTANCE;
+ private static final Model DEFAULT_INSTANCE;
static {
- DEFAULT_INSTANCE = new com.farsunset.cim.sdk.server.model.proto.MessageProto.Model();
+ DEFAULT_INSTANCE = new Model();
}
- public static com.farsunset.cim.sdk.server.model.proto.MessageProto.Model getDefaultInstance() {
+ public static Model getDefaultInstance() {
return DEFAULT_INSTANCE;
}
private static final com.google.protobuf.Parser
PARSER = new com.google.protobuf.AbstractParser() {
- @java.lang.Override
+ @Override
public Model parsePartialFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1499,13 +1594,13 @@ public final class MessageProto {
return PARSER;
}
- @java.lang.Override
+ @Override
public com.google.protobuf.Parser getParserForType() {
return PARSER;
}
- @java.lang.Override
- public com.farsunset.cim.sdk.server.model.proto.MessageProto.Model getDefaultInstanceForType() {
+ @Override
+ public Model getDefaultInstanceForType() {
return DEFAULT_INSTANCE;
}
@@ -1524,7 +1619,7 @@ public final class MessageProto {
private static com.google.protobuf.Descriptors.FileDescriptor
descriptor;
static {
- java.lang.String[] descriptorData = {
+ String[] descriptorData = {
"\n\rMessage.proto\022(com.farsunset.cim.sdk.s" +
"erver.model.proto\"\227\001\n\005Model\022\n\n\002id\030\001 \001(\003\022" +
"\016\n\006action\030\002 \001(\t\022\017\n\007content\030\003 \001(\t\022\016\n\006send" +
@@ -1532,24 +1627,16 @@ public final class MessageProto {
"\t\022\r\n\005title\030\007 \001(\t\022\016\n\006format\030\010 \001(\t\022\021\n\ttime" +
"stamp\030\t \001(\003B\016B\014MessageProtob\006proto3"
};
- com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
- descriptor = root;
- return null;
- }
- };
- com.google.protobuf.Descriptors.FileDescriptor
+ descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
- }, assigner);
+ });
internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor =
getDescriptor().getMessageTypes().get(0);
internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor,
- new java.lang.String[] { "Id", "Action", "Content", "Sender", "Receiver", "Extra", "Title", "Format", "Timestamp", });
+ new String[] { "Id", "Action", "Content", "Sender", "Receiver", "Extra", "Title", "Format", "Timestamp", });
}
// @@protoc_insertion_point(outer_class_scope)
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/proto/ReplyBody.proto b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/ReplyBody.proto
similarity index 90%
rename from cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/proto/ReplyBody.proto
rename to cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/ReplyBody.proto
index 8bc7102..f778479 100644
--- a/cim-server-sdk/cim-server-sdk-mina/src/com/farsunset/cim/sdk/server/model/proto/ReplyBody.proto
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/ReplyBody.proto
@@ -5,7 +5,7 @@ option java_outer_classname="ReplyBodyProto";
message Model {
string key = 1;
string code = 2;
- message = 3;
+ string message = 3;
int64 timestamp =4;
map data =5;
diff --git a/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/ReplyBodyProto.java b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/ReplyBodyProto.java
new file mode 100644
index 0000000..ec6be3a
--- /dev/null
+++ b/cim-server-sdk/cim-server-sdk-mina/src/main/java/com/farsunset/cim/sdk/server/model/proto/ReplyBodyProto.java
@@ -0,0 +1,1304 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: ReplyBody.proto
+
+package com.farsunset.cim.sdk.server.model.proto;
+
+public final class ReplyBodyProto {
+ private ReplyBodyProto() {}
+ public static void registerAllExtensions(
+ com.google.protobuf.ExtensionRegistryLite registry) {
+ }
+
+ public static void registerAllExtensions(
+ com.google.protobuf.ExtensionRegistry registry) {
+ registerAllExtensions(
+ (com.google.protobuf.ExtensionRegistryLite) registry);
+ }
+ public interface ModelOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:com.farsunset.cim.sdk.server.model.proto.Model)
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ * string key = 1;
+ * @return The key.
+ */
+ String getKey();
+ /**
+ * string key = 1;
+ * @return The bytes for key.
+ */
+ com.google.protobuf.ByteString
+ getKeyBytes();
+
+ /**
+ * string code = 2;
+ * @return The code.
+ */
+ String getCode();
+ /**
+ * string code = 2;
+ * @return The bytes for code.
+ */
+ com.google.protobuf.ByteString
+ getCodeBytes();
+
+ /**
+ * string message = 3;
+ * @return The message.
+ */
+ String getMessage();
+ /**
+ * string message = 3;
+ * @return The bytes for message.
+ */
+ com.google.protobuf.ByteString
+ getMessageBytes();
+
+ /**
+ * int64 timestamp = 4;
+ * @return The timestamp.
+ */
+ long getTimestamp();
+
+ /**
+ * map<string, string> data = 5;
+ */
+ int getDataCount();
+ /**
+ * map<string, string> data = 5;
+ */
+ boolean containsData(
+ String key);
+ /**
+ * Use {@link #getDataMap()} instead.
+ */
+ @Deprecated
+ java.util.Map
+ getData();
+ /**
+ * map<string, string> data = 5;
+ */
+ java.util.Map
+ getDataMap();
+ /**
+ * map<string, string> data = 5;
+ */
+
+ String getDataOrDefault(
+ String key,
+ String defaultValue);
+ /**
+ * map<string, string> data = 5;
+ */
+
+ String getDataOrThrow(
+ String key);
+ }
+ /**
+ * Protobuf type {@code com.farsunset.cim.sdk.server.model.proto.Model}
+ */
+ public static final class Model extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:com.farsunset.cim.sdk.server.model.proto.Model)
+ ModelOrBuilder {
+ private static final long serialVersionUID = 0L;
+ // Use Model.newBuilder() to construct.
+ private Model(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+ private Model() {
+ key_ = "";
+ code_ = "";
+ message_ = "";
+ }
+
+ @Override
+ @SuppressWarnings({"unused"})
+ protected Object newInstance(
+ UnusedPrivateParameter unused) {
+ return new Model();
+ }
+
+ @Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private Model(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ this();
+ if (extensionRegistry == null) {
+ throw new NullPointerException();
+ }
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 10: {
+ String s = input.readStringRequireUtf8();
+
+ key_ = s;
+ break;
+ }
+ case 18: {
+ String s = input.readStringRequireUtf8();
+
+ code_ = s;
+ break;
+ }
+ case 26: {
+ String s = input.readStringRequireUtf8();
+
+ message_ = s;
+ break;
+ }
+ case 32: {
+
+ timestamp_ = input.readInt64();
+ break;
+ }
+ case 42: {
+ if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+ data_ = com.google.protobuf.MapField.newMapField(
+ DataDefaultEntryHolder.defaultEntry);
+ mutable_bitField0_ |= 0x00000001;
+ }
+ com.google.protobuf.MapEntry
+ data__ = input.readMessage(
+ DataDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+ data_.getMutableMap().put(
+ data__.getKey(), data__.getValue());
+ break;
+ }
+ default: {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return ReplyBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_descriptor;
+ }
+
+ @SuppressWarnings({"rawtypes"})
+ @Override
+ protected com.google.protobuf.MapField internalGetMapField(
+ int number) {
+ switch (number) {
+ case 5:
+ return internalGetData();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @Override
+ protected FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return ReplyBodyProto.internal_static_com_farsunset_cim_sdk_server_model_proto_Model_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ Model.class, Builder.class);
+ }
+
+ public static final int KEY_FIELD_NUMBER = 1;
+ private volatile Object key_;
+ /**
+ *