diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..c92ce7c --- /dev/null +++ b/.classpath @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..508798c --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + central_api + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..a867ef5 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/proto=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..714351a --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..1133129 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic" +} \ No newline at end of file diff --git a/golang/server_grpc.pb.go b/golang/central-api.pb.go similarity index 59% rename from golang/server_grpc.pb.go rename to golang/central-api.pb.go index d3ec97a..6880954 100644 --- a/golang/server_grpc.pb.go +++ b/golang/central-api.pb.go @@ -1,18 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: server_grpc.proto +// source: central-api.proto /* -Package server_grpc is a generated protocol buffer package. +Package central_api is a generated protocol buffer package. It is generated from these files: - server_grpc.proto + central-api.proto It has these top-level messages: ServerInput ServerParam ServerOutput */ -package server_grpc +package central_api import proto "github.com/golang/protobuf/proto" import fmt "fmt" @@ -128,87 +128,88 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// Client API for OverflowApiServer service +// Client API for CentralAPI service -type OverflowApiServerClient interface { +type CentralAPIClient interface { Exec(ctx context.Context, in *ServerInput, opts ...grpc.CallOption) (*ServerOutput, error) } -type overflowApiServerClient struct { +type centralAPIClient struct { cc *grpc.ClientConn } -func NewOverflowApiServerClient(cc *grpc.ClientConn) OverflowApiServerClient { - return &overflowApiServerClient{cc} +func NewCentralAPIClient(cc *grpc.ClientConn) CentralAPIClient { + return ¢ralAPIClient{cc} } -func (c *overflowApiServerClient) Exec(ctx context.Context, in *ServerInput, opts ...grpc.CallOption) (*ServerOutput, error) { +func (c *centralAPIClient) Exec(ctx context.Context, in *ServerInput, opts ...grpc.CallOption) (*ServerOutput, error) { out := new(ServerOutput) - err := grpc.Invoke(ctx, "/OverflowApiServer/exec", in, out, c.cc, opts...) + err := grpc.Invoke(ctx, "/CentralAPI/exec", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -// Server API for OverflowApiServer service +// Server API for CentralAPI service -type OverflowApiServerServer interface { +type CentralAPIServer interface { Exec(context.Context, *ServerInput) (*ServerOutput, error) } -func RegisterOverflowApiServerServer(s *grpc.Server, srv OverflowApiServerServer) { - s.RegisterService(&_OverflowApiServer_serviceDesc, srv) +func RegisterCentralAPIServer(s *grpc.Server, srv CentralAPIServer) { + s.RegisterService(&_CentralAPI_serviceDesc, srv) } -func _OverflowApiServer_Exec_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _CentralAPI_Exec_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ServerInput) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(OverflowApiServerServer).Exec(ctx, in) + return srv.(CentralAPIServer).Exec(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/OverflowApiServer/Exec", + FullMethod: "/CentralAPI/Exec", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OverflowApiServerServer).Exec(ctx, req.(*ServerInput)) + return srv.(CentralAPIServer).Exec(ctx, req.(*ServerInput)) } return interceptor(ctx, in, info, handler) } -var _OverflowApiServer_serviceDesc = grpc.ServiceDesc{ - ServiceName: "OverflowApiServer", - HandlerType: (*OverflowApiServerServer)(nil), +var _CentralAPI_serviceDesc = grpc.ServiceDesc{ + ServiceName: "CentralAPI", + HandlerType: (*CentralAPIServer)(nil), Methods: []grpc.MethodDesc{ { MethodName: "exec", - Handler: _OverflowApiServer_Exec_Handler, + Handler: _CentralAPI_Exec_Handler, }, }, Streams: []grpc.StreamDesc{}, - Metadata: "server_grpc.proto", + Metadata: "central-api.proto", } -func init() { proto.RegisterFile("server_grpc.proto", fileDescriptor0) } +func init() { proto.RegisterFile("central-api.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 240 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0x3d, 0x4f, 0xc3, 0x30, - 0x10, 0x40, 0x31, 0xa9, 0x2a, 0x38, 0xc2, 0x50, 0x0f, 0x10, 0x31, 0xa0, 0xc8, 0x12, 0xa8, 0x93, - 0x07, 0xd8, 0xd8, 0x80, 0x89, 0xa9, 0x55, 0x11, 0x03, 0x13, 0x32, 0xe9, 0xb5, 0x44, 0x72, 0x7a, - 0x96, 0x73, 0x29, 0xf0, 0x0f, 0xf8, 0xd9, 0xc8, 0x1f, 0xa0, 0x76, 0xbb, 0xf7, 0x24, 0x3f, 0x9d, - 0x0f, 0x26, 0x3d, 0xfa, 0x2d, 0xfa, 0xb7, 0xb5, 0x77, 0x8d, 0x76, 0x9e, 0x98, 0xd4, 0x0b, 0x9c, - 0x3c, 0x47, 0xf9, 0xb4, 0x71, 0x03, 0xcb, 0x33, 0x18, 0xb3, 0xf1, 0x6b, 0xe4, 0x4a, 0xd4, 0x62, - 0x7a, 0xbc, 0xc8, 0x14, 0x7c, 0x87, 0xfc, 0x41, 0xcb, 0xea, 0x30, 0xf9, 0x44, 0xc1, 0x3b, 0xe3, - 0x4d, 0xd7, 0x57, 0x45, 0x5d, 0x04, 0x9f, 0x48, 0xbd, 0xfe, 0x65, 0xe7, 0x81, 0xa5, 0x84, 0x11, - 0x7f, 0x3b, 0xcc, 0xd1, 0x38, 0x07, 0xb7, 0x34, 0x6c, 0x72, 0x30, 0xce, 0x52, 0x41, 0xd9, 0xf6, - 0x8f, 0x64, 0x2d, 0x36, 0xdc, 0xd2, 0xa6, 0x2a, 0x6a, 0x31, 0x3d, 0x5a, 0xec, 0x39, 0x75, 0x0d, - 0x65, 0x4a, 0xcf, 0x06, 0xce, 0x2b, 0x7b, 0xec, 0x07, 0xfb, 0xbf, 0x72, 0xa2, 0x9b, 0x3b, 0x98, - 0xcc, 0xb6, 0xe8, 0x57, 0x96, 0x3e, 0xef, 0x5d, 0x9b, 0x9e, 0xc8, 0x2b, 0x18, 0xe1, 0x17, 0x36, - 0xb2, 0xd4, 0x3b, 0xbf, 0xbe, 0x38, 0xd5, 0xbb, 0x45, 0x75, 0xf0, 0x70, 0x09, 0xe7, 0x0d, 0x75, - 0xda, 0x92, 0x59, 0x59, 0xd4, 0x94, 0x33, 0xda, 0xb8, 0x76, 0x2e, 0x7e, 0x84, 0x78, 0x1f, 0xc7, - 0xe3, 0xdd, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x11, 0xfd, 0x20, 0xaf, 0x51, 0x01, 0x00, 0x00, + // 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, + 0x07, 0xfa, 0x05, 0xd0, 0xa9, 0x13, 0x51, 0x11, 0x03, 0xa3, 0x49, 0xaf, 0x10, 0xc9, 0xc9, 0x59, + 0xce, 0xa5, 0xc0, 0x1f, 0xf0, 0xd9, 0xc8, 0xb1, 0x41, 0x61, 0xbb, 0xf7, 0x86, 0xa7, 0xbb, 0x83, + 0x8b, 0x1a, 0x3b, 0xf6, 0xc6, 0xde, 0x1a, 0xd7, 0x68, 0xe7, 0x89, 0x49, 0x3d, 0xc3, 0xd9, 0x13, + 0xfa, 0x03, 0xfa, 0x4d, 0xe7, 0x06, 0x96, 0x97, 0x30, 0x67, 0xe3, 0xdf, 0x90, 0x0b, 0x51, 0x8a, + 0xe5, 0xe9, 0x36, 0x51, 0xf0, 0x2d, 0xf2, 0x3b, 0xed, 0x8a, 0xe3, 0xe8, 0x23, 0x05, 0xef, 0x8c, + 0x37, 0x6d, 0x5f, 0x64, 0x65, 0x16, 0x7c, 0x24, 0xf5, 0xf2, 0x9b, 0xad, 0x02, 0x4b, 0x09, 0x33, + 0xfe, 0x72, 0x98, 0xa2, 0xe3, 0x1c, 0xdc, 0xce, 0xb0, 0x49, 0xc1, 0x71, 0x96, 0x0a, 0xf2, 0xa6, + 0x5f, 0x93, 0xb5, 0x58, 0x73, 0x43, 0x5d, 0x91, 0x95, 0x62, 0x79, 0xb2, 0xfd, 0xe7, 0xd4, 0x02, + 0xf2, 0x98, 0x7e, 0x1c, 0x38, 0xad, 0xec, 0xb1, 0x1f, 0xec, 0xdf, 0xca, 0x91, 0xee, 0x56, 0x00, + 0xeb, 0x78, 0xee, 0x7d, 0xb5, 0x91, 0x37, 0x30, 0xc3, 0x4f, 0xac, 0x65, 0xae, 0x27, 0xe7, 0x5e, + 0x9d, 0xeb, 0x69, 0x4a, 0x1d, 0x3d, 0x2c, 0xe0, 0xba, 0xa6, 0x56, 0x5b, 0x32, 0x7b, 0x8b, 0x9a, + 0x0e, 0xe8, 0xf7, 0x96, 0x3e, 0x74, 0xfa, 0x9b, 0x36, 0xae, 0xa9, 0xc4, 0xb7, 0x10, 0xaf, 0xf3, + 0xf1, 0x7b, 0xab, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6c, 0xcd, 0x0f, 0x07, 0x52, 0x01, 0x00, + 0x00, } diff --git a/golang/server_test.go b/golang/central-api_test.go similarity index 89% rename from golang/server_test.go rename to golang/central-api_test.go index 42763f0..16b07d4 100644 --- a/golang/server_test.go +++ b/golang/central-api_test.go @@ -1,15 +1,16 @@ -package server_grpc +package central_api import ( - "testing" - "google.golang.org/grpc" - "golang.org/x/net/context" "io/ioutil" + "testing" + + "golang.org/x/net/context" + "google.golang.org/grpc" ) func TestTarDis_saveAllTarget(t *testing.T) { - contents,_ := ioutil.ReadFile("../dh.json") + contents, _ := ioutil.ReadFile("../dh.json") si := &ServerInput{} @@ -23,10 +24,8 @@ func TestTarDis_saveAllTarget(t *testing.T) { } - func TestRPCNP_readAllByDomain(t *testing.T) { - si := &ServerInput{} si.Target = "NoAuthProbeService" @@ -36,7 +35,7 @@ func TestRPCNP_readAllByDomain(t *testing.T) { //sp.IsCollection = false //sp.Type = "com.loafle.overflow.module.domain.model.Domain" //sp.Data = "{\"id\":1}" - si.Params = append(si.Params, "{\"id\":1}") + si.Params = append(si.Params, "{\"id\":1}") callRPC(t, si) } @@ -58,4 +57,4 @@ func callRPC(t *testing.T, si *ServerInput) { t.Log(out) -} \ No newline at end of file +} diff --git a/pom.xml b/pom.xml index dec1853..0a24319 100644 --- a/pom.xml +++ b/pom.xml @@ -5,16 +5,16 @@ 4.0.0 - com.loafle + com.loafle.maven maven_parent_jar 1.0.0-RELEASE - com.loafle - central_api + com.loafle.overflow + central-api jar 1.0.0-SNAPSHOT - com.loafle.central_api + com.loafle.overflow.central-api 1.2.0 diff --git a/src/main/proto/build b/src/main/proto/build new file mode 100755 index 0000000..1b0dd11 --- /dev/null +++ b/src/main/proto/build @@ -0,0 +1,21 @@ + +# https://github.com/google/protobuf/releases +# Unzip +#unzip protoc-3.3.0-linux-x86_64.zip -d protoc3 + +# Move protoc to /usr/local/bin/ +#sudo mv protoc3/bin/* /usr/local/bin/ + +# Move protoc3/include to /usr/local/include/ +#sudo mv protoc3/include/* /usr/local/include/ + +# For go +#go get -u github.com/golang/protobuf/protoc-gen-go + +# Optional: change owner +#sudo chown $USER /usr/local/bin/protoc +#sudo chown -R $USER /usr/local/include/google + + + +protoc -I src/main/proto/ src/main/proto/central-api.proto --go_out=plugins=grpc:golang \ No newline at end of file diff --git a/src/main/proto/server_grpc.proto b/src/main/proto/central-api.proto similarity index 83% rename from src/main/proto/server_grpc.proto rename to src/main/proto/central-api.proto index 97464f6..3a03e84 100644 --- a/src/main/proto/server_grpc.proto +++ b/src/main/proto/central-api.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_multiple_files = true; -option java_package = "com.loafle.overflow.api"; +option java_package = "com.loafle.overflow.central.api"; option java_generic_services = true; message ServerInput { @@ -20,7 +20,7 @@ message ServerOutput { string result = 1; } -service OverflowApiServer { +service CentralAPI { rpc exec(ServerInput) returns (ServerOutput) {} } diff --git a/src/main/proto/cmd b/src/main/proto/cmd deleted file mode 100644 index cba582f..0000000 --- a/src/main/proto/cmd +++ /dev/null @@ -1 +0,0 @@ -protoc -I src/main/proto/ src/main/proto/server_grpc.proto --go_out=plugins=grpc:golang \ No newline at end of file