azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit for push proto files

Browse Source
This commit is contained in:
MaximZaitsev
2016-07-20 15:54:59 +03:00
parent 4beec6b50c
commit 426fc9de81
4 changed files with 79 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
car_srv/clients/flash/src/main/java/Main.kt
+11 -11
View File
@@ -45,17 +45,17 @@ fun main(args: Array<String>) {
return; return;
} }
// val bytesBinTest = Carkot.Upload.newBuilder().setData(ByteString.copyFrom(fileBytes)).setBase(mcuSystem).build().toByteArray() val bytesBinTest = Carkot.Upload.newBuilder().setData(ByteString.copyFrom(fileBytes)).setBase(mcuSystem).build().toByteArray()
// val request = DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "/loadBin", Unpooled.copiedBuffer(bytesBinTest)); val request = DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.POST, "/loadBin", Unpooled.copiedBuffer(bytesBinTest));
// request.headers().set(HttpHeaderNames.HOST, host) request.headers().set(HttpHeaderNames.HOST, host)
// request.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.CLOSE) request.headers().set(HttpHeaderNames.CONNECTION, HttpHeaderValues.CLOSE)
// request.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, request.content().readableBytes()) request.headers().setInt(HttpHeaderNames.CONTENT_LENGTH, request.content().readableBytes())
// request.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/plain; charset=UTF-8") request.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/plain; charset=UTF-8")
//
// client.Client.sendRequest(request, host, port) client.Client.sendRequest(request, host, port)
// println(client.ClientHandler.requestResult.code) println(client.ClientHandler.requestResult.code)
// println(client.ClientHandler.requestResult.stdErr) println(client.ClientHandler.requestResult.stdErr)
// println(client.ClientHandler.requestResult.stdOut) println(client.ClientHandler.requestResult.stdOut)
} }
fun saveFileConfig(actualValues: Map<String, String>) { fun saveFileConfig(actualValues: Map<String, String>) {
car_srv/clients/flash/src/main/java/carkot.kt
+47 -47
View File
@@ -1,11 +1,11 @@
class Upload private constructor (data: ByteArray = ByteArray(0), base: kotlin.String = "", method: Method = Upload.Method.BuilderMethod().build()) { class Upload private constructor (data: ByteArray = ByteArray(0), base: String = "", method: Upload.Method = Upload.Method.BuilderMethod().build()) {
var data : ByteArray var data : ByteArray
private set private set
var base : kotlin.String var base : String
private set private set
var method : Method var method : Upload.Method
private set private set
@@ -14,17 +14,17 @@ class Upload private constructor (data: ByteArray = ByteArray(0), base: kotlin.S
this.base = base this.base = base
this.method = method this.method = method
} }
class Method private constructor (type: TYPE = Upload.Method.TYPE.fromIntToTYPE(0), port: kotlin.String = "", device: kotlin.String = "", arguments: MutableList <kotlin.String> = mutableListOf()) { class Method private constructor (type: Upload.Method.TYPE = Upload.Method.TYPE.fromIntToTYPE(0), port: String = "", device: String = "", arguments: MutableList <String> = mutableListOf()) {
var type : TYPE var type : Upload.Method.TYPE
private set private set
var port : kotlin.String var port : String
private set private set
var device : kotlin.String var device : String
private set private set
var arguments : MutableList <kotlin.String> var arguments : MutableList <String>
private set private set
@@ -70,43 +70,43 @@ class Upload private constructor (data: ByteArray = ByteArray(0), base: kotlin.S
} }
} }
class BuilderMethod constructor (type: TYPE = Upload.Method.TYPE.fromIntToTYPE(0), port: kotlin.String = "", device: kotlin.String = "", arguments: MutableList <kotlin.String> = mutableListOf()) { class BuilderMethod constructor (type: Upload.Method.TYPE = Upload.Method.TYPE.fromIntToTYPE(0), port: String = "", device: String = "", arguments: MutableList <String> = mutableListOf()) {
var type : TYPE var type : Upload.Method.TYPE
private set private set
fun setType(value: TYPE): Upload.Method.BuilderMethod { fun setType(value: Upload.Method.TYPE): Upload.Method.BuilderMethod {
type = value type = value
return this return this
} }
var port : kotlin.String var port : String
private set private set
fun setPort(value: kotlin.String): Upload.Method.BuilderMethod { fun setPort(value: String): Upload.Method.BuilderMethod {
port = value port = value
return this return this
} }
var device : kotlin.String var device : String
private set private set
fun setDevice(value: kotlin.String): Upload.Method.BuilderMethod { fun setDevice(value: String): Upload.Method.BuilderMethod {
device = value device = value
return this return this
} }
var arguments : MutableList <kotlin.String> var arguments : MutableList <String>
private set private set
fun setArguments(value: MutableList <kotlin.String> ): Upload.Method.BuilderMethod { fun setArguments(value: MutableList <String>): Upload.Method.BuilderMethod {
arguments = value arguments = value
return this return this
} }
fun setkotlin.String(index: Int, value: kotlin.String): { fun setString(index: Int, value: String): Upload.Method.BuilderMethod {
arguments[index] = value arguments[index] = value
return this return this
} }
fun addkotlin.String(value: kotlin.String): { fun addString(value: String): Upload.Method.BuilderMethod {
arguments.add(value) arguments.add(value)
return this return this
} }
fun addAllkotlin.String(value: Iterable<kotlin.String>): { fun addAllString(value: Iterable<String>): Upload.Method.BuilderMethod {
for (item in value) { for (item in value) {
arguments.add(item) arguments.add(item)
} }
@@ -122,23 +122,23 @@ class Upload private constructor (data: ByteArray = ByteArray(0), base: kotlin.S
} }
fun readFrom (input: CodedInputStream): Upload.Method.BuilderMethod { fun readFrom (input: CodedInputStream): Upload.Method.BuilderMethod {
type = TYPE.fromIntToTYPE(input.readEnum(1)) type = Upload.Method.TYPE.fromIntToTYPE(input.readEnum(1))
port = input.readString(2) port = input.readString(2)
device = input.readString(3) device = input.readString(3)
val tag = input.readTag(4, WireType.LENGTH_DELIMITED) val tag = input.readTag(4, WireType.LENGTH_DELIMITED)
val expectedSize = input.readInt32NoTag() val expectedSize = input.readInt32NoTag()
var readSize = 0 var readSize = 0
while(readSize != expectedSize) { while(readSize != expectedSize) {
val tmp: kotlin.String.Builderkotlin.String = kotlin.String.Builderkotlin.String() var tmp: String = ""
tmp = input.readString(4) tmp = input.readString(4)
readSize += WireFormat.getStringSize(4, tmp) readSize += WireFormat.getStringSize(4, tmp)
arguments.add(tmp.build()) arguments.add(tmp)
} }
return this return this
} }
fun build(): Method { fun build(): Upload.Method {
return Method(type, port, device, arguments) return Upload.Method(type, port, device, arguments)
} }
fun parseFieldFrom(input: CodedInputStream): Boolean { fun parseFieldFrom(input: CodedInputStream): Boolean {
@@ -148,17 +148,17 @@ class Upload private constructor (data: ByteArray = ByteArray(0), base: kotlin.S
val fieldNumber = WireFormat.getTagFieldNumber(tag) val fieldNumber = WireFormat.getTagFieldNumber(tag)
val wireType = WireFormat.getTagWireType(tag) val wireType = WireFormat.getTagWireType(tag)
when(fieldNumber) { when(fieldNumber) {
1 -> type = TYPE.fromIntToTYPE(input.readEnumNoTag()) 1 -> type = Upload.Method.TYPE.fromIntToTYPE(input.readEnumNoTag())
2 -> port = input.readStringNoTag() 2 -> port = input.readStringNoTag()
3 -> device = input.readStringNoTag() 3 -> device = input.readStringNoTag()
4 -> { 4 -> {
val expectedSize = input.readInt32NoTag() val expectedSize = input.readInt32NoTag()
var readSize = 0 var readSize = 0
while(readSize != expectedSize) { while(readSize != expectedSize) {
val tmp: kotlin.String.Builderkotlin.String = kotlin.String.Builderkotlin.String() var tmp: String = ""
tmp = input.readString(4) tmp = input.readString(4)
readSize += WireFormat.getStringSize(4, tmp) readSize += WireFormat.getStringSize(4, tmp)
arguments.add(tmp.build()) arguments.add(tmp)
} }
} }
} }
@@ -184,7 +184,7 @@ class Upload private constructor (data: ByteArray = ByteArray(0), base: kotlin.S
} }
fun mergeWith (other: Method) { fun mergeWith (other: Upload.Method) {
type = other.type type = other.type
port = other.port port = other.port
device = other.device device = other.device
@@ -219,7 +219,7 @@ class Upload private constructor (data: ByteArray = ByteArray(0), base: kotlin.S
method.writeTo(output) method.writeTo(output)
} }
class BuilderUpload constructor (data: ByteArray = ByteArray(0), base: kotlin.String = "", method: Method = Upload.Method.BuilderMethod().build()) { class BuilderUpload constructor (data: ByteArray = ByteArray(0), base: String = "", method: Upload.Method = Upload.Method.BuilderMethod().build()) {
var data : ByteArray var data : ByteArray
private set private set
fun setData(value: ByteArray): Upload.BuilderUpload { fun setData(value: ByteArray): Upload.BuilderUpload {
@@ -227,16 +227,16 @@ class Upload private constructor (data: ByteArray = ByteArray(0), base: kotlin.S
return this return this
} }
var base : kotlin.String var base : String
private set private set
fun setBase(value: kotlin.String): Upload.BuilderUpload { fun setBase(value: String): Upload.BuilderUpload {
base = value base = value
return this return this
} }
var method : Method var method : Upload.Method
private set private set
fun setMethod(value: Method): Upload.BuilderUpload { fun setMethod(value: Upload.Method): Upload.BuilderUpload {
method = value method = value
return this return this
} }
@@ -312,11 +312,11 @@ class Upload private constructor (data: ByteArray = ByteArray(0), base: kotlin.S
} }
class UploadResult private constructor (stdOut: kotlin.String = "", stdErr: kotlin.String = "", resultCode: Int = 0) { class UploadResult private constructor (stdOut: String = "", stdErr: String = "", resultCode: Int = 0) {
var stdOut : kotlin.String var stdOut : String
private set private set
var stdErr : kotlin.String var stdErr : String
private set private set
var resultCode : Int var resultCode : Int
@@ -335,17 +335,17 @@ class UploadResult private constructor (stdOut: kotlin.String = "", stdErr: kotl
output.writeInt32 (3, resultCode) output.writeInt32 (3, resultCode)
} }
class BuilderUploadResult constructor (stdOut: kotlin.String = "", stdErr: kotlin.String = "", resultCode: Int = 0) { class BuilderUploadResult constructor (stdOut: String = "", stdErr: String = "", resultCode: Int = 0) {
var stdOut : kotlin.String var stdOut : String
private set private set
fun setStdOut(value: kotlin.String): UploadResult.BuilderUploadResult { fun setStdOut(value: String): UploadResult.BuilderUploadResult {
stdOut = value stdOut = value
return this return this
} }
var stdErr : kotlin.String var stdErr : String
private set private set
fun setStdErr(value: kotlin.String): UploadResult.BuilderUploadResult { fun setStdErr(value: String): UploadResult.BuilderUploadResult {
stdErr = value stdErr = value
return this return this
} }
@@ -420,8 +420,8 @@ class UploadResult private constructor (stdOut: kotlin.String = "", stdErr: kotl
} }
class LogMessage private constructor (source: kotlin.String = "", message: ByteArray = ByteArray(0)) { class LogMessage private constructor (source: String = "", message: ByteArray = ByteArray(0)) {
var source : kotlin.String var source : String
private set private set
var message : ByteArray var message : ByteArray
@@ -438,10 +438,10 @@ class LogMessage private constructor (source: kotlin.String = "", message: ByteA
output.writeBytes (2, message) output.writeBytes (2, message)
} }
class BuilderLogMessage constructor (source: kotlin.String = "", message: ByteArray = ByteArray(0)) { class BuilderLogMessage constructor (source: String = "", message: ByteArray = ByteArray(0)) {
var source : kotlin.String var source : String
private set private set
fun setSource(value: kotlin.String): LogMessage.BuilderLogMessage { fun setSource(value: String): LogMessage.BuilderLogMessage {
source = value source = value
return this return this
} }
car_srv/clients/flash/src/main/java/client/Client.kt
+2 -2
View File
@@ -32,10 +32,10 @@ class Client constructor(host: String, port: Int) {
channel.closeFuture().sync() channel.closeFuture().sync()
} catch (e: InterruptedException) { } catch (e: InterruptedException) {
ClientHandler.requestResult.code = 2 ClientHandler.requestResult.code = 2
ClientHandler.requestResult.errorString = "command execution interrupted" // ClientHandler.requestResult.errorString = "command execution interrupted"
} catch (e: ConnectException) { } catch (e: ConnectException) {
ClientHandler.requestResult.code = 1 ClientHandler.requestResult.code = 1
ClientHandler.requestResult.errorString = "don't can connect to server ($host:$port)" // ClientHandler.requestResult.errorString = "don't can connect to server ($host:$port)"
} finally { } finally {
group.shutdownGracefully() group.shutdownGracefully()
} }
car_srv/clients/flash/src/main/java/client/ClientHandler.kt
+19 -12
View File
@@ -4,6 +4,8 @@ import com.google.protobuf.InvalidProtocolBufferException
import io.netty.channel.ChannelHandlerContext import io.netty.channel.ChannelHandlerContext
import io.netty.channel.SimpleChannelInboundHandler import io.netty.channel.SimpleChannelInboundHandler
import io.netty.handler.codec.http.HttpContent import io.netty.handler.codec.http.HttpContent
import java.io.ByteArrayInputStream
import CodedInputStream
/** /**
* Created by user on 7/8/16. * Created by user on 7/8/16.
@@ -22,24 +24,29 @@ class ClientHandler : SimpleChannelInboundHandler<Any> {
override fun channelReadComplete(ctx: ChannelHandlerContext) { override fun channelReadComplete(ctx: ChannelHandlerContext) {
val resultCode:Int if (contentBytes.size == 0) {
val resultStdOut:String ctx.close()
val resultStdErr:String return
}
val resultCode: Int
val resultStdOut: String
val resultStdErr: String
try { try {
// val uploadResult: Carkot.UploadResult = Carkot.UploadResult.parseFrom(contentBytes) val uploadResult = UploadResult.BuilderUploadResult().build()
// resultCode = uploadResult.resultCode uploadResult.mergeFrom(CodedInputStream(ByteArrayInputStream(contentBytes)))
// resultStdOut = uploadResult.stdOut resultCode = uploadResult.resultCode
// resultStdErr = uploadResult.stdErr resultStdOut = uploadResult.stdOut
resultStdErr = uploadResult.stdErr
} catch (e: InvalidProtocolBufferException) { } catch (e: InvalidProtocolBufferException) {
e.printStackTrace() resultStdErr = "error in "
resultStdErr = ""
resultStdOut = "" resultStdOut = ""
resultCode = 2 resultCode = 2
} }
synchronized(requestResult, { synchronized(requestResult, {
// requestResult.code = resultCode requestResult.code = resultCode
// requestResult.stdErr = resultStdErr requestResult.stdErr = resultStdErr
// requestResult.stdOut = resultStdOut requestResult.stdOut = resultStdOut
}) })
ctx.close() ctx.close()
} }