refine proto package names

app/dns/config.proto

@@ -1,12 +1,14 @@
 syntax = "proto3";
 
-package com.v2ray.core.app.dns;
+package v2ray.core.app.dns;
 option go_package = "dns";
+option java_package = "com.v2ray.core.app.dns";
+option java_outer_classname = "ConfigProto";
 
 import "v2ray.com/core/common/net/address.proto";
 import "v2ray.com/core/common/net/destination.proto";
 
 message Config {
-  repeated com.v2ray.core.common.net.DestinationPB NameServers = 1;
-  map<string, com.v2ray.core.common.net.AddressPB> Hosts = 2;
+  repeated v2ray.core.common.net.DestinationPB NameServers = 1;
+  map<string, v2ray.core.common.net.AddressPB> Hosts = 2;
 }

common/net/address.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.common.net;
+package v2ray.core.common.net;
 option go_package = "net";
+option java_package = "com.v2ray.core.common.net";
+option java_outer_classname = "AddressProto";
 
 message AddressPB {
   oneof address {

common/net/destination.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.common.net;
+package v2ray.core.common.net;
 option go_package = "net";
+option java_package = "com.v2ray.core.common.net";
+option java_outer_classname = "DestinationProto";
 
 import "v2ray.com/core/common/net/network.proto";
 import "v2ray.com/core/common/net/address.proto";

common/net/network.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.common.net;
+package v2ray.core.common.net;
 option go_package = "net";
+option java_package = "com.v2ray.core.common.net";
+option java_outer_classname = "NetworkProto";
 
 enum Network {
   Unknown = 0;

common/net/port.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.common.net;
+package v2ray.core.common.net;
 option go_package = "net";
+option java_package = "com.v2ray.core.common.net";
+option java_outer_classname = "PortProto";
 
 // PortRange represents a range of ports.
 message PortRange {

common/protocol/server_spec.proto

@@ -1,13 +1,15 @@
 syntax = "proto3";
 
+package v2ray.core.common.protocol;
+option go_package = "protocol";
+option java_package = "com.v2ray.core.common.protocol";
+option java_outer_classname = "ServerSpecProto";
+
 import "v2ray.com/core/common/net/address.proto";
 import "v2ray.com/core/common/protocol/user.proto";
 
-package com.v2ray.core.common.protocol;
-option go_package = "protocol";
-
 message ServerSpecPB {
-  com.v2ray.core.common.net.AddressPB address = 1;
+  v2ray.core.common.net.AddressPB address = 1;
   uint32 port = 2;
-  repeated com.v2ray.core.common.protocol.User user = 3;
+  repeated v2ray.core.common.protocol.User user = 3;
 }

common/protocol/user.proto

@@ -1,9 +1,11 @@
 syntax = "proto3";
 
-import "google/protobuf/any.proto";
-
-package com.v2ray.core.common.protocol;
+package v2ray.core.common.protocol;
 option go_package = "protocol";
+option java_package = "com.v2ray.core.common.protocol";
+option java_outer_classname = "UserProto";
+
+import "google/protobuf/any.proto";
 
 message User {
   uint32 level = 1;

proxy/blackhole/config.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.proxy.blackhole;
+package v2ray.core.proxy.blackhole;
 option go_package = "blackhole";
+option java_package = "com.v2ray.core.proxy.blackhole";
+option java_outer_classname = "ConfigProto";
 
 import "google/protobuf/any.proto";
 

proxy/dokodemo/config.proto

@@ -1,15 +1,17 @@
 syntax = "proto3";
 
-package com.v2ray.core.proxy.dokodemo;
+package v2ray.core.proxy.dokodemo;
 option go_package = "dokodemo";
+option java_package = "com.v2ray.core.proxy.dokodemo";
+option java_outer_classname = "ConfigProto";
 
 import "v2ray.com/core/common/net/address.proto";
 import "v2ray.com/core/common/net/network.proto";
 
 message Config {
-  com.v2ray.core.common.net.AddressPB address = 1;
+  v2ray.core.common.net.AddressPB address = 1;
   uint32 port = 2;
-  com.v2ray.core.common.net.NetworkList network_list = 3;
+  v2ray.core.common.net.NetworkList network_list = 3;
   uint32 timeout = 4;
   bool follow_redirect = 5;
 }

proxy/freedom/config.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.proxy.freedom;
+package v2ray.core.proxy.freedom;
 option go_package = "freedom";
+option java_package = "com.v2ray.core.proxy.freedom";
+option java_outer_classname = "ConfigProto";
 
 message Config {
   enum DomainStrategy {

proxy/http/config.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.proxy.http;
+package v2ray.core.proxy.http;
 option go_package = "http";
+option java_package = "com.v2ray.core.proxy.http";
+option java_outer_classname = "ConfigProto";
 
 // Config for HTTP proxy server.
 message ServerConfig {

proxy/shadowsocks/config.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.proxy.shadowsocks;
+package v2ray.core.proxy.shadowsocks;
 option go_package = "shadowsocks";
+option java_package = "com.v2ray.core.proxy.shadowsocks";
+option java_outer_classname = "ConfigProto";
 
 import "v2ray.com/core/common/protocol/user.proto";
 import "v2ray.com/core/common/protocol/server_spec.proto";
@@ -21,9 +23,9 @@ enum CipherType {
 
 message ServerConfig {
   bool udp_enabled = 1;
-  com.v2ray.core.common.protocol.User user = 2;
+  v2ray.core.common.protocol.User user = 2;
 }
 
 message ClientConfig {
-  repeated com.v2ray.core.common.protocol.ServerSpecPB server = 1;
+  repeated v2ray.core.common.protocol.ServerSpecPB server = 1;
 }

proxy/socks/config.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.proxy.socks;
+package v2ray.core.proxy.socks;
 option go_package = "socks";
+option java_package = "com.v2ray.core.proxy.socks";
+option java_outer_classname = "ConfigProto";
 
 import "v2ray.com/core/common/net/address.proto";
 import "v2ray.com/core/common/protocol/server_spec.proto";
@@ -19,11 +21,11 @@ enum AuthType {
 message ServerConfig {
   AuthType auth_type = 1;
   map<string, string> accounts = 2;
-  com.v2ray.core.common.net.AddressPB address = 3;
+  v2ray.core.common.net.AddressPB address = 3;
   bool udp_enabled = 4;
   uint32 timeout = 5;
 }
 
 message ClientConfig {
-  repeated com.v2ray.core.common.protocol.ServerSpecPB server = 1;
+  repeated v2ray.core.common.protocol.ServerSpecPB server = 1;
 }

proxy/vmess/account.proto

@@ -1,8 +1,11 @@
 syntax = "proto3";
 
-package com.v2ray.core.proxy.vmess;
+package v2ray.core.proxy.vmess;
 option go_package = "vmess";
 
+option java_package = "com.v2ray.core.proxy.vmess";
+option java_outer_classname = "AccountProto";
+
 message AccountPB {
   string id = 1;
   uint32 alter_id = 2;

proxy/vmess/inbound/config.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.proxy.vmess.inbound;
+package v2ray.core.proxy.vmess.inbound;
 option go_package = "inbound";
+option java_package = "com.v2ray.core.proxy.vmess.inbound";
+option java_outer_classname = "ConfigProto";
 
 import "v2ray.com/core/common/protocol/user.proto";
 
@@ -15,7 +17,7 @@ message DefaultConfig {
 }
 
 message Config {
-  repeated com.v2ray.core.common.protocol.User user = 1;
+  repeated v2ray.core.common.protocol.User user = 1;
   DefaultConfig default = 2;
   DetourConfig detour = 3;
 }

proxy/vmess/outbound/config.proto

@@ -1,10 +1,12 @@
 syntax = "proto3";
 
-package com.v2ray.core.proxy.vmess.outbound;
+package v2ray.core.proxy.vmess.outbound;
 option go_package = "outbound";
+option java_package = "com.v2ray.core.proxy.vmess.outbound";
+option java_outer_classname = "ConfigProto";
 
 import "v2ray.com/core/common/protocol/server_spec.proto";
 
 message Config {
-  repeated com.v2ray.core.common.protocol.ServerSpecPB Receiver = 1;
+  repeated v2ray.core.common.protocol.ServerSpecPB Receiver = 1;
 }

transport/internet/authenticator.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.transport.internet;
+package v2ray.core.transport.internet;
 option go_package = "internet";
+option java_package = "com.v2ray.core.transport.internet";
+option java_outer_classname = "AuthenticatorProto";
 
 import "google/protobuf/any.proto";
 

transport/internet/authenticators/noop/config.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
 
-package com.v2ray.core.transport.internet.authenticators.noop;
+package v2ray.core.transport.internet.authenticators.noop;
 option go_package = "noop";
+option java_package = "com.v2ray.core.transport.internet.authenticators.noop";
+option java_outer_classname = "ConfigProto";
 
 message Config {}

transport/internet/authenticators/srtp/config.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.transport.internet.authenticators.srtp;
+package v2ray.core.transport.internet.authenticators.srtp;
 option go_package = "srtp";
+option java_package = "com.v2ray.core.transport.internet.authenticators.srtp";
+option java_outer_classname = "ConfigProto";
 
 message Config {
   uint32 version = 1;

transport/internet/authenticators/utp/config.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.transport.internet.authenticators.utp;
+package v2ray.core.transport.internet.authenticators.utp;
 option go_package = "utp";
+option java_package = "com.v2ray.core.transport.internet.authenticators.utp";
+option java_outer_classname = "ConfigProto";
 
 message Config {
   uint32 version = 1;

transport/internet/kcp/config.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 
-package com.v2ray.core.transport.internet.kcp;
+package v2ray.core.transport.internet.kcp;
 option go_package = "kcp";
+option java_package = "com.v2ray.core.transport.internet.kcp";
+option java_outer_classname = "ConfigProto";
 
 import "v2ray.com/core/transport/internet/authenticator.proto";
 
@@ -43,5 +45,5 @@ message Config {
   bool congestion = 5;
   WriteBuffer write_buffer = 6;
   ReadBuffer read_buffer = 7;
-  com.v2ray.core.transport.internet.AuthenticatorConfig header_config = 8;
+  v2ray.core.transport.internet.AuthenticatorConfig header_config = 8;
 }