From 0110ed7672190b5ec9d386ad5638f691a0e09645 Mon Sep 17 00:00:00 2001 From: crusader Date: Fri, 11 May 2018 20:36:29 +0900 Subject: [PATCH] ing --- .settings/org.eclipse.core.resources.prefs | 2 + golang/central-api.pb.go | 119 +++++++++++++++------ pom.xml | 6 +- src/main/proto/build | 2 +- 4 files changed, 93 insertions(+), 36 deletions(-) diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index a867ef5..9ae0ac4 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,6 @@ eclipse.preferences.version=1 encoding//src/main/proto=UTF-8 encoding//src/main/resources=UTF-8 +encoding//target/generated-sources/protobuf/grpc-java=UTF-8 +encoding//target/generated-sources/protobuf/java=UTF-8 encoding/=UTF-8 diff --git a/golang/central-api.pb.go b/golang/central-api.pb.go index 6880954..6b25a0a 100644 --- a/golang/central-api.pb.go +++ b/golang/central-api.pb.go @@ -1,17 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: central-api.proto -/* -Package central_api is a generated protocol buffer package. - -It is generated from these files: - central-api.proto - -It has these top-level messages: - ServerInput - ServerParam - ServerOutput -*/ package central_api import proto "github.com/golang/protobuf/proto" @@ -35,15 +24,37 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type ServerInput struct { - Target string `protobuf:"bytes,1,opt,name=target" json:"target,omitempty"` - Method string `protobuf:"bytes,2,opt,name=method" json:"method,omitempty"` - Params []string `protobuf:"bytes,3,rep,name=params" json:"params,omitempty"` + Target string `protobuf:"bytes,1,opt,name=target" json:"target,omitempty"` + Method string `protobuf:"bytes,2,opt,name=method" json:"method,omitempty"` + Params []string `protobuf:"bytes,3,rep,name=params" json:"params,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *ServerInput) Reset() { *m = ServerInput{} } -func (m *ServerInput) String() string { return proto.CompactTextString(m) } -func (*ServerInput) ProtoMessage() {} -func (*ServerInput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (m *ServerInput) Reset() { *m = ServerInput{} } +func (m *ServerInput) String() string { return proto.CompactTextString(m) } +func (*ServerInput) ProtoMessage() {} +func (*ServerInput) Descriptor() ([]byte, []int) { + return fileDescriptor_central_api_90f582576a9bbfba, []int{0} +} +func (m *ServerInput) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ServerInput.Unmarshal(m, b) +} +func (m *ServerInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ServerInput.Marshal(b, m, deterministic) +} +func (dst *ServerInput) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServerInput.Merge(dst, src) +} +func (m *ServerInput) XXX_Size() int { + return xxx_messageInfo_ServerInput.Size(m) +} +func (m *ServerInput) XXX_DiscardUnknown() { + xxx_messageInfo_ServerInput.DiscardUnknown(m) +} + +var xxx_messageInfo_ServerInput proto.InternalMessageInfo func (m *ServerInput) GetTarget() string { if m != nil { @@ -67,15 +78,37 @@ func (m *ServerInput) GetParams() []string { } type ServerParam struct { - Type string `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"` - Data string `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"` - IsCollection bool `protobuf:"varint,3,opt,name=isCollection" json:"isCollection,omitempty"` + Type string `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"` + Data string `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"` + IsCollection bool `protobuf:"varint,3,opt,name=isCollection" json:"isCollection,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *ServerParam) Reset() { *m = ServerParam{} } -func (m *ServerParam) String() string { return proto.CompactTextString(m) } -func (*ServerParam) ProtoMessage() {} -func (*ServerParam) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } +func (m *ServerParam) Reset() { *m = ServerParam{} } +func (m *ServerParam) String() string { return proto.CompactTextString(m) } +func (*ServerParam) ProtoMessage() {} +func (*ServerParam) Descriptor() ([]byte, []int) { + return fileDescriptor_central_api_90f582576a9bbfba, []int{1} +} +func (m *ServerParam) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ServerParam.Unmarshal(m, b) +} +func (m *ServerParam) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ServerParam.Marshal(b, m, deterministic) +} +func (dst *ServerParam) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServerParam.Merge(dst, src) +} +func (m *ServerParam) XXX_Size() int { + return xxx_messageInfo_ServerParam.Size(m) +} +func (m *ServerParam) XXX_DiscardUnknown() { + xxx_messageInfo_ServerParam.DiscardUnknown(m) +} + +var xxx_messageInfo_ServerParam proto.InternalMessageInfo func (m *ServerParam) GetType() string { if m != nil { @@ -99,13 +132,35 @@ func (m *ServerParam) GetIsCollection() bool { } type ServerOutput struct { - Result string `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"` + Result string `protobuf:"bytes,1,opt,name=result" json:"result,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *ServerOutput) Reset() { *m = ServerOutput{} } -func (m *ServerOutput) String() string { return proto.CompactTextString(m) } -func (*ServerOutput) ProtoMessage() {} -func (*ServerOutput) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } +func (m *ServerOutput) Reset() { *m = ServerOutput{} } +func (m *ServerOutput) String() string { return proto.CompactTextString(m) } +func (*ServerOutput) ProtoMessage() {} +func (*ServerOutput) Descriptor() ([]byte, []int) { + return fileDescriptor_central_api_90f582576a9bbfba, []int{2} +} +func (m *ServerOutput) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_ServerOutput.Unmarshal(m, b) +} +func (m *ServerOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_ServerOutput.Marshal(b, m, deterministic) +} +func (dst *ServerOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_ServerOutput.Merge(dst, src) +} +func (m *ServerOutput) XXX_Size() int { + return xxx_messageInfo_ServerOutput.Size(m) +} +func (m *ServerOutput) XXX_DiscardUnknown() { + xxx_messageInfo_ServerOutput.DiscardUnknown(m) +} + +var xxx_messageInfo_ServerOutput proto.InternalMessageInfo func (m *ServerOutput) GetResult() string { if m != nil { @@ -192,9 +247,9 @@ var _CentralAPI_serviceDesc = grpc.ServiceDesc{ Metadata: "central-api.proto", } -func init() { proto.RegisterFile("central-api.proto", fileDescriptor0) } +func init() { proto.RegisterFile("central-api.proto", fileDescriptor_central_api_90f582576a9bbfba) } -var fileDescriptor0 = []byte{ +var fileDescriptor_central_api_90f582576a9bbfba = []byte{ // 241 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xb1, 0x4e, 0xc3, 0x30, 0x10, 0x40, 0x31, 0xa9, 0x2a, 0x38, 0xc2, 0x80, 0x07, 0x14, 0xb1, 0x10, 0x59, 0xa2, 0xea, 0x82, diff --git a/pom.xml b/pom.xml index 0a24319..86be429 100644 --- a/pom.xml +++ b/pom.xml @@ -17,9 +17,9 @@ com.loafle.overflow.central-api - 1.2.0 - 3.2.0 - 0.5.0 + 1.12.0 + 3.5.1 + 0.5.1 diff --git a/src/main/proto/build b/src/main/proto/build index 1b0dd11..8c9e8db 100755 --- a/src/main/proto/build +++ b/src/main/proto/build @@ -1,7 +1,7 @@ # https://github.com/google/protobuf/releases # Unzip -#unzip protoc-3.3.0-linux-x86_64.zip -d protoc3 +#unzip protoc-3.5.1-linux-x86_64.zip -d protoc3 # Move protoc to /usr/local/bin/ #sudo mv protoc3/bin/* /usr/local/bin/