diff --git a/im-client/src/main/java/net/sopod/soim/client/cmd/CmdEnum.java b/im-client/src/main/java/net/sopod/soim/client/cmd/CmdEnum.java index de62ba2..fb03ee7 100644 --- a/im-client/src/main/java/net/sopod/soim/client/cmd/CmdEnum.java +++ b/im-client/src/main/java/net/sopod/soim/client/cmd/CmdEnum.java @@ -1,10 +1,7 @@ package net.sopod.soim.client.cmd; import net.sopod.soim.client.cmd.handler.CmdHandler; -import net.sopod.soim.client.handler.cmd.ExitHandler; -import net.sopod.soim.client.handler.cmd.LoginHandler; -import net.sopod.soim.client.handler.cmd.SendHandler; -import net.sopod.soim.client.handler.cmd.UsersHandler; +import net.sopod.soim.client.handler.cmd.*; /** * Commands @@ -26,6 +23,9 @@ public enum CmdEnum { /** 用户分组列表 */ groups, + /** 用户搜索 */ + search(SearchHandler.class), + help, /** 退出 */ diff --git a/im-client/src/main/java/net/sopod/soim/client/cmd/args/ArgsSearch.java b/im-client/src/main/java/net/sopod/soim/client/cmd/args/ArgsSearch.java new file mode 100644 index 0000000..44428cc --- /dev/null +++ b/im-client/src/main/java/net/sopod/soim/client/cmd/args/ArgsSearch.java @@ -0,0 +1,21 @@ +package net.sopod.soim.client.cmd.args; + +import com.beust.jcommander.Parameter; + +import java.util.List; + +/** + * ArgsSearch + * + * @author tmy + * @date 2022-05-17 23:10 + */ +public class ArgsSearch { + + @Parameter + private List parameters; + + @Parameter(names = {"-u", "-account"}, required = false, description = "账号") + private String account; + +} diff --git a/im-client/src/main/java/net/sopod/soim/client/handler/cmd/SearchHandler.java b/im-client/src/main/java/net/sopod/soim/client/handler/cmd/SearchHandler.java new file mode 100644 index 0000000..79fc405 --- /dev/null +++ b/im-client/src/main/java/net/sopod/soim/client/handler/cmd/SearchHandler.java @@ -0,0 +1,33 @@ +package net.sopod.soim.client.handler.cmd; + +import com.google.inject.Inject; +import com.google.inject.Singleton; +import net.sopod.soim.client.cmd.args.ArgsSearch; +import net.sopod.soim.client.cmd.handler.CmdHandler; +import net.sopod.soim.client.session.SoImSession; +import net.sopod.soim.data.msg.friend.Friend; + +/** + * SearchHandler + * + * @author tmy + * @date 2022-05-17 23:09 + */ +@Singleton +public class SearchHandler implements CmdHandler { + + @Inject + private SoImSession soImSession; + + @Override + public ArgsSearch newArgsInstance() { + return new ArgsSearch(); + } + + @Override + public void handleArgs(ArgsSearch args) { + Friend.ReqFriendSearch reqSearch = Friend.ReqFriendSearch.newBuilder().setKeyword("").build(); + soImSession.send(reqSearch); + } + +} diff --git a/im-client/src/main/java/net/sopod/soim/client/handler/msg/ResFriendSearchHandler.java b/im-client/src/main/java/net/sopod/soim/client/handler/msg/ResFriendSearchHandler.java new file mode 100644 index 0000000..2cb212d --- /dev/null +++ b/im-client/src/main/java/net/sopod/soim/client/handler/msg/ResFriendSearchHandler.java @@ -0,0 +1,29 @@ +package net.sopod.soim.client.handler.msg; + +import com.google.inject.Singleton; +import net.sopod.soim.client.logger.Logger; +import net.sopod.soim.client.session.MessageHandler; +import net.sopod.soim.data.msg.friend.Friend; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * ResFriendSearchHandler + * + * @author tmy + * @date 2022-05-17 23:41 + */ +@Singleton +public class ResFriendSearchHandler implements MessageHandler { + + @Override + public void handleMsg(Friend.ResFriendSearch msg) { + List usersList = msg.getUsersList(); + List userLines = usersList.stream() + .map(u -> u.getUid() + "|" + u.getAccount() + "|" + u.getNickname()) + .collect(Collectors.toList()); + Logger.logList("搜索结果", userLines); + } + +} diff --git a/im-das-api/im-das-user-api/src/main/java/net/sopod/soim/das/user/api/service/UserDas.java b/im-das-api/im-das-user-api/src/main/java/net/sopod/soim/das/user/api/service/UserDas.java index a517e71..8d03cbb 100644 --- a/im-das-api/im-das-user-api/src/main/java/net/sopod/soim/das/user/api/service/UserDas.java +++ b/im-das-api/im-das-user-api/src/main/java/net/sopod/soim/das/user/api/service/UserDas.java @@ -2,6 +2,8 @@ package net.sopod.soim.das.user.api.service; import net.sopod.soim.das.user.api.model.entity.ImUser; +import java.util.List; + /** * DasUserService * @@ -14,4 +16,6 @@ public interface UserDas { ImUser getNormalUserByAccount(String account); + List searchImUser(String keyword, Integer limit); + } diff --git a/im-das/im-das-user/src/main/java/net/sopod/soim/das/user/service/UserDasImpl.java b/im-das/im-das-user/src/main/java/net/sopod/soim/das/user/service/UserDasImpl.java index dd40b47..f29b331 100644 --- a/im-das/im-das-user/src/main/java/net/sopod/soim/das/user/service/UserDasImpl.java +++ b/im-das/im-das-user/src/main/java/net/sopod/soim/das/user/service/UserDasImpl.java @@ -2,6 +2,7 @@ package net.sopod.soim.das.user.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.AllArgsConstructor; import net.sopod.soim.common.constant.LogicConsts; import net.sopod.soim.das.user.api.model.entity.ImUser; @@ -9,6 +10,8 @@ import net.sopod.soim.das.user.api.service.UserDas; import net.sopod.soim.das.user.dao.UserMapper; import org.apache.dubbo.config.annotation.DubboService; +import java.util.List; + /** * UserDasServiceImpl * @@ -34,4 +37,14 @@ public class UserDasImpl implements UserDas { return userMapper.selectOne(accountQuery); } + public List searchImUser(String keyword, Integer limit) { + Page page = new Page<>(); + page.setCurrent(1).setSize(limit); + LambdaQueryWrapper userQuery = new QueryWrapper().lambda() + .likeRight(ImUser::getAccount, keyword); + Page imUserPage = userMapper.selectPage(page, userQuery); + return imUserPage.getRecords(); + } + + } diff --git a/im-entry/pom.xml b/im-entry/pom.xml index 5353112..7902ceb 100644 --- a/im-entry/pom.xml +++ b/im-entry/pom.xml @@ -36,6 +36,11 @@ im-logic-user-api ${soim.version} + + net.sopod + im-logic-friend-api + ${soim.version} + org.projectlombok lombok diff --git a/im-entry/src/main/java/net/sopod/soim/entry/handlers/friend/ReqFriendSearchHandler.java b/im-entry/src/main/java/net/sopod/soim/entry/handlers/friend/ReqFriendSearchHandler.java new file mode 100644 index 0000000..2a525dc --- /dev/null +++ b/im-entry/src/main/java/net/sopod/soim/entry/handlers/friend/ReqFriendSearchHandler.java @@ -0,0 +1,54 @@ +package net.sopod.soim.entry.handlers.friend; + +import com.google.protobuf.MessageLite; +import lombok.extern.slf4j.Slf4j; +import net.sopod.soim.data.msg.friend.Friend; +import net.sopod.soim.entry.server.handler.AccountMessageHandler; +import net.sopod.soim.entry.server.session.Account; +import net.sopod.soim.logic.api.friend.search.AccountInfo; +import net.sopod.soim.logic.api.friend.search.AccountSearchService; +import net.sopod.soim.logic.api.friend.search.ReqAccountSearch; +import net.sopod.soim.logic.api.friend.search.ResAccountSearch; +import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; + +/** + * ReqFriendSearchHandler + * 账号搜索服务 + * + * @author tmy + * @date 2022-05-17 22:54 + */ +@Slf4j +@Service +public class ReqFriendSearchHandler extends AccountMessageHandler { + + @DubboReference + private AccountSearchService accountSearchService; + + @Override + public MessageLite handle(Account account, Friend.ReqFriendSearch msg) { + msg.getKeyword(); + ReqAccountSearch search = ReqAccountSearch.newBuilder().setKeyword(msg.getKeyword()).build(); + CompletableFuture future = accountSearchService.searchAccountLikelyAsync(search); + future.thenAccept(res -> { + log.info("用户搜索开始..."); + List accounts = res.getAccountsList(); + List userInfos = accounts.stream().map( + acc -> Friend.UserInfo.newBuilder() + .setAccount(acc.getAccount()) + .setNickname(acc.getNickname()) + .setUid(acc.getUid()) + .build() + ).collect(Collectors.toList()); + Friend.ResFriendSearch resSearch = Friend.ResFriendSearch.newBuilder().addAllUsers(userInfos).build(); + account.writeNow(resSearch); + }); + return null; + } + +} diff --git a/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/friend/Friend.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/friend/Friend.java new file mode 100644 index 0000000..ea81737 --- /dev/null +++ b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/friend/Friend.java @@ -0,0 +1,2225 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto/friend/Friend.proto + +package net.sopod.soim.data.msg.friend; + +public final class Friend { + private Friend() {} + 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 ReqFriendSearchOrBuilder extends + // @@protoc_insertion_point(interface_extends:net.sopod.soim.data.msg.friend.ReqFriendSearch) + com.google.protobuf.MessageOrBuilder { + + /** + * string keyword = 1; + * @return The keyword. + */ + java.lang.String getKeyword(); + /** + * string keyword = 1; + * @return The bytes for keyword. + */ + com.google.protobuf.ByteString + getKeywordBytes(); + } + /** + * Protobuf type {@code net.sopod.soim.data.msg.friend.ReqFriendSearch} + */ + public static final class ReqFriendSearch extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:net.sopod.soim.data.msg.friend.ReqFriendSearch) + ReqFriendSearchOrBuilder { + private static final long serialVersionUID = 0L; + // Use ReqFriendSearch.newBuilder() to construct. + private ReqFriendSearch(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ReqFriendSearch() { + keyword_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new ReqFriendSearch(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ReqFriendSearch( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + 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: { + java.lang.String s = input.readStringRequireUtf8(); + + keyword_ = s; + 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 net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_ReqFriendSearch_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_ReqFriendSearch_fieldAccessorTable + .ensureFieldAccessorsInitialized( + net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch.class, net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch.Builder.class); + } + + public static final int KEYWORD_FIELD_NUMBER = 1; + private volatile java.lang.Object keyword_; + /** + * string keyword = 1; + * @return The keyword. + */ + @java.lang.Override + public java.lang.String getKeyword() { + java.lang.Object ref = keyword_; + 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(); + keyword_ = s; + return s; + } + } + /** + * string keyword = 1; + * @return The bytes for keyword. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getKeywordBytes() { + java.lang.Object ref = keyword_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + keyword_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(keyword_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, keyword_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(keyword_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, keyword_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch)) { + return super.equals(obj); + } + net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch other = (net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch) obj; + + if (!getKeyword() + .equals(other.getKeyword())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + KEYWORD_FIELD_NUMBER; + hash = (53 * hash) + getKeyword().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch 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 net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch 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 net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + 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 net.sopod.soim.data.msg.friend.ReqFriendSearch} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:net.sopod.soim.data.msg.friend.ReqFriendSearch) + net.sopod.soim.data.msg.friend.Friend.ReqFriendSearchOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_ReqFriendSearch_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_ReqFriendSearch_fieldAccessorTable + .ensureFieldAccessorsInitialized( + net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch.class, net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch.Builder.class); + } + + // Construct using net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + keyword_ = ""; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_ReqFriendSearch_descriptor; + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch getDefaultInstanceForType() { + return net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch.getDefaultInstance(); + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch build() { + net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch buildPartial() { + net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch result = new net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch(this); + result.keyword_ = keyword_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch) { + return mergeFrom((net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch other) { + if (other == net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch.getDefaultInstance()) return this; + if (!other.getKeyword().isEmpty()) { + keyword_ = other.keyword_; + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private java.lang.Object keyword_ = ""; + /** + * string keyword = 1; + * @return The keyword. + */ + public java.lang.String getKeyword() { + java.lang.Object ref = keyword_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + keyword_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string keyword = 1; + * @return The bytes for keyword. + */ + public com.google.protobuf.ByteString + getKeywordBytes() { + java.lang.Object ref = keyword_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + keyword_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string keyword = 1; + * @param value The keyword to set. + * @return This builder for chaining. + */ + public Builder setKeyword( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + keyword_ = value; + onChanged(); + return this; + } + /** + * string keyword = 1; + * @return This builder for chaining. + */ + public Builder clearKeyword() { + + keyword_ = getDefaultInstance().getKeyword(); + onChanged(); + return this; + } + /** + * string keyword = 1; + * @param value The bytes for keyword to set. + * @return This builder for chaining. + */ + public Builder setKeywordBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + keyword_ = value; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:net.sopod.soim.data.msg.friend.ReqFriendSearch) + } + + // @@protoc_insertion_point(class_scope:net.sopod.soim.data.msg.friend.ReqFriendSearch) + private static final net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch(); + } + + public static net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public ReqFriendSearch parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ReqFriendSearch(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.ReqFriendSearch getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface ResFriendSearchOrBuilder extends + // @@protoc_insertion_point(interface_extends:net.sopod.soim.data.msg.friend.ResFriendSearch) + com.google.protobuf.MessageOrBuilder { + + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + java.util.List + getUsersList(); + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + net.sopod.soim.data.msg.friend.Friend.UserInfo getUsers(int index); + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + int getUsersCount(); + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + java.util.List + getUsersOrBuilderList(); + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + net.sopod.soim.data.msg.friend.Friend.UserInfoOrBuilder getUsersOrBuilder( + int index); + } + /** + * Protobuf type {@code net.sopod.soim.data.msg.friend.ResFriendSearch} + */ + public static final class ResFriendSearch extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:net.sopod.soim.data.msg.friend.ResFriendSearch) + ResFriendSearchOrBuilder { + private static final long serialVersionUID = 0L; + // Use ResFriendSearch.newBuilder() to construct. + private ResFriendSearch(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private ResFriendSearch() { + users_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new ResFriendSearch(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ResFriendSearch( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.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 66: { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { + users_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + users_.add( + input.readMessage(net.sopod.soim.data.msg.friend.Friend.UserInfo.parser(), extensionRegistry)); + 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 { + if (((mutable_bitField0_ & 0x00000001) != 0)) { + users_ = java.util.Collections.unmodifiableList(users_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_ResFriendSearch_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_ResFriendSearch_fieldAccessorTable + .ensureFieldAccessorsInitialized( + net.sopod.soim.data.msg.friend.Friend.ResFriendSearch.class, net.sopod.soim.data.msg.friend.Friend.ResFriendSearch.Builder.class); + } + + public static final int USERS_FIELD_NUMBER = 8; + private java.util.List users_; + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + @java.lang.Override + public java.util.List getUsersList() { + return users_; + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + @java.lang.Override + public java.util.List + getUsersOrBuilderList() { + return users_; + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + @java.lang.Override + public int getUsersCount() { + return users_.size(); + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.UserInfo getUsers(int index) { + return users_.get(index); + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.UserInfoOrBuilder getUsersOrBuilder( + int index) { + return users_.get(index); + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + for (int i = 0; i < users_.size(); i++) { + output.writeMessage(8, users_.get(i)); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < users_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(8, users_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.sopod.soim.data.msg.friend.Friend.ResFriendSearch)) { + return super.equals(obj); + } + net.sopod.soim.data.msg.friend.Friend.ResFriendSearch other = (net.sopod.soim.data.msg.friend.Friend.ResFriendSearch) obj; + + if (!getUsersList() + .equals(other.getUsersList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getUsersCount() > 0) { + hash = (37 * hash) + USERS_FIELD_NUMBER; + hash = (53 * hash) + getUsersList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.sopod.soim.data.msg.friend.Friend.ResFriendSearch parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.sopod.soim.data.msg.friend.Friend.ResFriendSearch parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static net.sopod.soim.data.msg.friend.Friend.ResFriendSearch parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.sopod.soim.data.msg.friend.Friend.ResFriendSearch parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static net.sopod.soim.data.msg.friend.Friend.ResFriendSearch parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.sopod.soim.data.msg.friend.Friend.ResFriendSearch parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static net.sopod.soim.data.msg.friend.Friend.ResFriendSearch parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static net.sopod.soim.data.msg.friend.Friend.ResFriendSearch 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 net.sopod.soim.data.msg.friend.Friend.ResFriendSearch parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static net.sopod.soim.data.msg.friend.Friend.ResFriendSearch 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 net.sopod.soim.data.msg.friend.Friend.ResFriendSearch parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static net.sopod.soim.data.msg.friend.Friend.ResFriendSearch parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(net.sopod.soim.data.msg.friend.Friend.ResFriendSearch prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + 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 net.sopod.soim.data.msg.friend.ResFriendSearch} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:net.sopod.soim.data.msg.friend.ResFriendSearch) + net.sopod.soim.data.msg.friend.Friend.ResFriendSearchOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_ResFriendSearch_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_ResFriendSearch_fieldAccessorTable + .ensureFieldAccessorsInitialized( + net.sopod.soim.data.msg.friend.Friend.ResFriendSearch.class, net.sopod.soim.data.msg.friend.Friend.ResFriendSearch.Builder.class); + } + + // Construct using net.sopod.soim.data.msg.friend.Friend.ResFriendSearch.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getUsersFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (usersBuilder_ == null) { + users_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + usersBuilder_.clear(); + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_ResFriendSearch_descriptor; + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.ResFriendSearch getDefaultInstanceForType() { + return net.sopod.soim.data.msg.friend.Friend.ResFriendSearch.getDefaultInstance(); + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.ResFriendSearch build() { + net.sopod.soim.data.msg.friend.Friend.ResFriendSearch result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.ResFriendSearch buildPartial() { + net.sopod.soim.data.msg.friend.Friend.ResFriendSearch result = new net.sopod.soim.data.msg.friend.Friend.ResFriendSearch(this); + int from_bitField0_ = bitField0_; + if (usersBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0)) { + users_ = java.util.Collections.unmodifiableList(users_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.users_ = users_; + } else { + result.users_ = usersBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof net.sopod.soim.data.msg.friend.Friend.ResFriendSearch) { + return mergeFrom((net.sopod.soim.data.msg.friend.Friend.ResFriendSearch)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(net.sopod.soim.data.msg.friend.Friend.ResFriendSearch other) { + if (other == net.sopod.soim.data.msg.friend.Friend.ResFriendSearch.getDefaultInstance()) return this; + if (usersBuilder_ == null) { + if (!other.users_.isEmpty()) { + if (users_.isEmpty()) { + users_ = other.users_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureUsersIsMutable(); + users_.addAll(other.users_); + } + onChanged(); + } + } else { + if (!other.users_.isEmpty()) { + if (usersBuilder_.isEmpty()) { + usersBuilder_.dispose(); + usersBuilder_ = null; + users_ = other.users_; + bitField0_ = (bitField0_ & ~0x00000001); + usersBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getUsersFieldBuilder() : null; + } else { + usersBuilder_.addAllMessages(other.users_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + net.sopod.soim.data.msg.friend.Friend.ResFriendSearch parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (net.sopod.soim.data.msg.friend.Friend.ResFriendSearch) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.util.List users_ = + java.util.Collections.emptyList(); + private void ensureUsersIsMutable() { + if (!((bitField0_ & 0x00000001) != 0)) { + users_ = new java.util.ArrayList(users_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + net.sopod.soim.data.msg.friend.Friend.UserInfo, net.sopod.soim.data.msg.friend.Friend.UserInfo.Builder, net.sopod.soim.data.msg.friend.Friend.UserInfoOrBuilder> usersBuilder_; + + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public java.util.List getUsersList() { + if (usersBuilder_ == null) { + return java.util.Collections.unmodifiableList(users_); + } else { + return usersBuilder_.getMessageList(); + } + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public int getUsersCount() { + if (usersBuilder_ == null) { + return users_.size(); + } else { + return usersBuilder_.getCount(); + } + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public net.sopod.soim.data.msg.friend.Friend.UserInfo getUsers(int index) { + if (usersBuilder_ == null) { + return users_.get(index); + } else { + return usersBuilder_.getMessage(index); + } + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public Builder setUsers( + int index, net.sopod.soim.data.msg.friend.Friend.UserInfo value) { + if (usersBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureUsersIsMutable(); + users_.set(index, value); + onChanged(); + } else { + usersBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public Builder setUsers( + int index, net.sopod.soim.data.msg.friend.Friend.UserInfo.Builder builderForValue) { + if (usersBuilder_ == null) { + ensureUsersIsMutable(); + users_.set(index, builderForValue.build()); + onChanged(); + } else { + usersBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public Builder addUsers(net.sopod.soim.data.msg.friend.Friend.UserInfo value) { + if (usersBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureUsersIsMutable(); + users_.add(value); + onChanged(); + } else { + usersBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public Builder addUsers( + int index, net.sopod.soim.data.msg.friend.Friend.UserInfo value) { + if (usersBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureUsersIsMutable(); + users_.add(index, value); + onChanged(); + } else { + usersBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public Builder addUsers( + net.sopod.soim.data.msg.friend.Friend.UserInfo.Builder builderForValue) { + if (usersBuilder_ == null) { + ensureUsersIsMutable(); + users_.add(builderForValue.build()); + onChanged(); + } else { + usersBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public Builder addUsers( + int index, net.sopod.soim.data.msg.friend.Friend.UserInfo.Builder builderForValue) { + if (usersBuilder_ == null) { + ensureUsersIsMutable(); + users_.add(index, builderForValue.build()); + onChanged(); + } else { + usersBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public Builder addAllUsers( + java.lang.Iterable values) { + if (usersBuilder_ == null) { + ensureUsersIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, users_); + onChanged(); + } else { + usersBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public Builder clearUsers() { + if (usersBuilder_ == null) { + users_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + usersBuilder_.clear(); + } + return this; + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public Builder removeUsers(int index) { + if (usersBuilder_ == null) { + ensureUsersIsMutable(); + users_.remove(index); + onChanged(); + } else { + usersBuilder_.remove(index); + } + return this; + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public net.sopod.soim.data.msg.friend.Friend.UserInfo.Builder getUsersBuilder( + int index) { + return getUsersFieldBuilder().getBuilder(index); + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public net.sopod.soim.data.msg.friend.Friend.UserInfoOrBuilder getUsersOrBuilder( + int index) { + if (usersBuilder_ == null) { + return users_.get(index); } else { + return usersBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public java.util.List + getUsersOrBuilderList() { + if (usersBuilder_ != null) { + return usersBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(users_); + } + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public net.sopod.soim.data.msg.friend.Friend.UserInfo.Builder addUsersBuilder() { + return getUsersFieldBuilder().addBuilder( + net.sopod.soim.data.msg.friend.Friend.UserInfo.getDefaultInstance()); + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public net.sopod.soim.data.msg.friend.Friend.UserInfo.Builder addUsersBuilder( + int index) { + return getUsersFieldBuilder().addBuilder( + index, net.sopod.soim.data.msg.friend.Friend.UserInfo.getDefaultInstance()); + } + /** + * repeated .net.sopod.soim.data.msg.friend.UserInfo users = 8; + */ + public java.util.List + getUsersBuilderList() { + return getUsersFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + net.sopod.soim.data.msg.friend.Friend.UserInfo, net.sopod.soim.data.msg.friend.Friend.UserInfo.Builder, net.sopod.soim.data.msg.friend.Friend.UserInfoOrBuilder> + getUsersFieldBuilder() { + if (usersBuilder_ == null) { + usersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + net.sopod.soim.data.msg.friend.Friend.UserInfo, net.sopod.soim.data.msg.friend.Friend.UserInfo.Builder, net.sopod.soim.data.msg.friend.Friend.UserInfoOrBuilder>( + users_, + ((bitField0_ & 0x00000001) != 0), + getParentForChildren(), + isClean()); + users_ = null; + } + return usersBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:net.sopod.soim.data.msg.friend.ResFriendSearch) + } + + // @@protoc_insertion_point(class_scope:net.sopod.soim.data.msg.friend.ResFriendSearch) + private static final net.sopod.soim.data.msg.friend.Friend.ResFriendSearch DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new net.sopod.soim.data.msg.friend.Friend.ResFriendSearch(); + } + + public static net.sopod.soim.data.msg.friend.Friend.ResFriendSearch getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public ResFriendSearch parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ResFriendSearch(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.ResFriendSearch getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface UserInfoOrBuilder extends + // @@protoc_insertion_point(interface_extends:net.sopod.soim.data.msg.friend.UserInfo) + com.google.protobuf.MessageOrBuilder { + + /** + * int64 uid = 1; + * @return The uid. + */ + long getUid(); + + /** + * string account = 2; + * @return The account. + */ + java.lang.String getAccount(); + /** + * string account = 2; + * @return The bytes for account. + */ + com.google.protobuf.ByteString + getAccountBytes(); + + /** + * string nickname = 3; + * @return The nickname. + */ + java.lang.String getNickname(); + /** + * string nickname = 3; + * @return The bytes for nickname. + */ + com.google.protobuf.ByteString + getNicknameBytes(); + } + /** + * Protobuf type {@code net.sopod.soim.data.msg.friend.UserInfo} + */ + public static final class UserInfo extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:net.sopod.soim.data.msg.friend.UserInfo) + UserInfoOrBuilder { + private static final long serialVersionUID = 0L; + // Use UserInfo.newBuilder() to construct. + private UserInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private UserInfo() { + account_ = ""; + nickname_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new UserInfo(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private UserInfo( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + 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 8: { + + uid_ = input.readInt64(); + break; + } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + account_ = s; + break; + } + case 26: { + java.lang.String s = input.readStringRequireUtf8(); + + nickname_ = s; + 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 net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_UserInfo_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_UserInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + net.sopod.soim.data.msg.friend.Friend.UserInfo.class, net.sopod.soim.data.msg.friend.Friend.UserInfo.Builder.class); + } + + public static final int UID_FIELD_NUMBER = 1; + private long uid_; + /** + * int64 uid = 1; + * @return The uid. + */ + @java.lang.Override + public long getUid() { + return uid_; + } + + public static final int ACCOUNT_FIELD_NUMBER = 2; + private volatile java.lang.Object account_; + /** + * string account = 2; + * @return The account. + */ + @java.lang.Override + public java.lang.String getAccount() { + java.lang.Object ref = account_; + 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(); + account_ = s; + return s; + } + } + /** + * string account = 2; + * @return The bytes for account. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getAccountBytes() { + java.lang.Object ref = account_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + account_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int NICKNAME_FIELD_NUMBER = 3; + private volatile java.lang.Object nickname_; + /** + * string nickname = 3; + * @return The nickname. + */ + @java.lang.Override + public java.lang.String getNickname() { + java.lang.Object ref = nickname_; + 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(); + nickname_ = s; + return s; + } + } + /** + * string nickname = 3; + * @return The bytes for nickname. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getNicknameBytes() { + java.lang.Object ref = nickname_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + nickname_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (uid_ != 0L) { + output.writeInt64(1, uid_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(account_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, account_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, nickname_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (uid_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeInt64Size(1, uid_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(account_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, account_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, nickname_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof net.sopod.soim.data.msg.friend.Friend.UserInfo)) { + return super.equals(obj); + } + net.sopod.soim.data.msg.friend.Friend.UserInfo other = (net.sopod.soim.data.msg.friend.Friend.UserInfo) obj; + + if (getUid() + != other.getUid()) return false; + if (!getAccount() + .equals(other.getAccount())) return false; + if (!getNickname() + .equals(other.getNickname())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + UID_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getUid()); + hash = (37 * hash) + ACCOUNT_FIELD_NUMBER; + hash = (53 * hash) + getAccount().hashCode(); + hash = (37 * hash) + NICKNAME_FIELD_NUMBER; + hash = (53 * hash) + getNickname().hashCode(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static net.sopod.soim.data.msg.friend.Friend.UserInfo parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.sopod.soim.data.msg.friend.Friend.UserInfo parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static net.sopod.soim.data.msg.friend.Friend.UserInfo parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.sopod.soim.data.msg.friend.Friend.UserInfo parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static net.sopod.soim.data.msg.friend.Friend.UserInfo parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static net.sopod.soim.data.msg.friend.Friend.UserInfo parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static net.sopod.soim.data.msg.friend.Friend.UserInfo parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static net.sopod.soim.data.msg.friend.Friend.UserInfo 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 net.sopod.soim.data.msg.friend.Friend.UserInfo parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static net.sopod.soim.data.msg.friend.Friend.UserInfo 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 net.sopod.soim.data.msg.friend.Friend.UserInfo parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static net.sopod.soim.data.msg.friend.Friend.UserInfo parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(net.sopod.soim.data.msg.friend.Friend.UserInfo prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + 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 net.sopod.soim.data.msg.friend.UserInfo} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:net.sopod.soim.data.msg.friend.UserInfo) + net.sopod.soim.data.msg.friend.Friend.UserInfoOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_UserInfo_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_UserInfo_fieldAccessorTable + .ensureFieldAccessorsInitialized( + net.sopod.soim.data.msg.friend.Friend.UserInfo.class, net.sopod.soim.data.msg.friend.Friend.UserInfo.Builder.class); + } + + // Construct using net.sopod.soim.data.msg.friend.Friend.UserInfo.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + uid_ = 0L; + + account_ = ""; + + nickname_ = ""; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return net.sopod.soim.data.msg.friend.Friend.internal_static_net_sopod_soim_data_msg_friend_UserInfo_descriptor; + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.UserInfo getDefaultInstanceForType() { + return net.sopod.soim.data.msg.friend.Friend.UserInfo.getDefaultInstance(); + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.UserInfo build() { + net.sopod.soim.data.msg.friend.Friend.UserInfo result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.UserInfo buildPartial() { + net.sopod.soim.data.msg.friend.Friend.UserInfo result = new net.sopod.soim.data.msg.friend.Friend.UserInfo(this); + result.uid_ = uid_; + result.account_ = account_; + result.nickname_ = nickname_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof net.sopod.soim.data.msg.friend.Friend.UserInfo) { + return mergeFrom((net.sopod.soim.data.msg.friend.Friend.UserInfo)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(net.sopod.soim.data.msg.friend.Friend.UserInfo other) { + if (other == net.sopod.soim.data.msg.friend.Friend.UserInfo.getDefaultInstance()) return this; + if (other.getUid() != 0L) { + setUid(other.getUid()); + } + if (!other.getAccount().isEmpty()) { + account_ = other.account_; + onChanged(); + } + if (!other.getNickname().isEmpty()) { + nickname_ = other.nickname_; + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + net.sopod.soim.data.msg.friend.Friend.UserInfo parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (net.sopod.soim.data.msg.friend.Friend.UserInfo) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private long uid_ ; + /** + * int64 uid = 1; + * @return The uid. + */ + @java.lang.Override + public long getUid() { + return uid_; + } + /** + * int64 uid = 1; + * @param value The uid to set. + * @return This builder for chaining. + */ + public Builder setUid(long value) { + + uid_ = value; + onChanged(); + return this; + } + /** + * int64 uid = 1; + * @return This builder for chaining. + */ + public Builder clearUid() { + + uid_ = 0L; + onChanged(); + return this; + } + + private java.lang.Object account_ = ""; + /** + * string account = 2; + * @return The account. + */ + public java.lang.String getAccount() { + java.lang.Object ref = account_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + account_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string account = 2; + * @return The bytes for account. + */ + public com.google.protobuf.ByteString + getAccountBytes() { + java.lang.Object ref = account_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + account_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string account = 2; + * @param value The account to set. + * @return This builder for chaining. + */ + public Builder setAccount( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + account_ = value; + onChanged(); + return this; + } + /** + * string account = 2; + * @return This builder for chaining. + */ + public Builder clearAccount() { + + account_ = getDefaultInstance().getAccount(); + onChanged(); + return this; + } + /** + * string account = 2; + * @param value The bytes for account to set. + * @return This builder for chaining. + */ + public Builder setAccountBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + account_ = value; + onChanged(); + return this; + } + + private java.lang.Object nickname_ = ""; + /** + * string nickname = 3; + * @return The nickname. + */ + public java.lang.String getNickname() { + java.lang.Object ref = nickname_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + nickname_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string nickname = 3; + * @return The bytes for nickname. + */ + public com.google.protobuf.ByteString + getNicknameBytes() { + java.lang.Object ref = nickname_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + nickname_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string nickname = 3; + * @param value The nickname to set. + * @return This builder for chaining. + */ + public Builder setNickname( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + nickname_ = value; + onChanged(); + return this; + } + /** + * string nickname = 3; + * @return This builder for chaining. + */ + public Builder clearNickname() { + + nickname_ = getDefaultInstance().getNickname(); + onChanged(); + return this; + } + /** + * string nickname = 3; + * @param value The bytes for nickname to set. + * @return This builder for chaining. + */ + public Builder setNicknameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + nickname_ = value; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:net.sopod.soim.data.msg.friend.UserInfo) + } + + // @@protoc_insertion_point(class_scope:net.sopod.soim.data.msg.friend.UserInfo) + private static final net.sopod.soim.data.msg.friend.Friend.UserInfo DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new net.sopod.soim.data.msg.friend.Friend.UserInfo(); + } + + public static net.sopod.soim.data.msg.friend.Friend.UserInfo getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public UserInfo parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new UserInfo(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public net.sopod.soim.data.msg.friend.Friend.UserInfo getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_net_sopod_soim_data_msg_friend_ReqFriendSearch_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_net_sopod_soim_data_msg_friend_ReqFriendSearch_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_net_sopod_soim_data_msg_friend_ResFriendSearch_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_net_sopod_soim_data_msg_friend_ResFriendSearch_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_net_sopod_soim_data_msg_friend_UserInfo_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_net_sopod_soim_data_msg_friend_UserInfo_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\031proto/friend/Friend.proto\022\036net.sopod.s" + + "oim.data.msg.friend\"\"\n\017ReqFriendSearch\022\017" + + "\n\007keyword\030\001 \001(\t\"J\n\017ResFriendSearch\0227\n\005us" + + "ers\030\010 \003(\0132(.net.sopod.soim.data.msg.frie" + + "nd.UserInfo\":\n\010UserInfo\022\013\n\003uid\030\001 \001(\003\022\017\n\007" + + "account\030\002 \001(\t\022\020\n\010nickname\030\003 \001(\tB*\n\036net.s" + + "opod.soim.data.msg.friendB\006FriendP\000b\006pro" + + "to3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_net_sopod_soim_data_msg_friend_ReqFriendSearch_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_net_sopod_soim_data_msg_friend_ReqFriendSearch_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_net_sopod_soim_data_msg_friend_ReqFriendSearch_descriptor, + new java.lang.String[] { "Keyword", }); + internal_static_net_sopod_soim_data_msg_friend_ResFriendSearch_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_net_sopod_soim_data_msg_friend_ResFriendSearch_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_net_sopod_soim_data_msg_friend_ResFriendSearch_descriptor, + new java.lang.String[] { "Users", }); + internal_static_net_sopod_soim_data_msg_friend_UserInfo_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_net_sopod_soim_data_msg_friend_UserInfo_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_net_sopod_soim_data_msg_friend_UserInfo_descriptor, + new java.lang.String[] { "Uid", "Account", "Nickname", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/user/UserGroup.java b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/user/UserGroup.java index 9945112..fb8e5b6 100644 --- a/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/user/UserGroup.java +++ b/im-service-api/im-entry-protocol/src/main/java/net/sopod/soim/data/msg/user/UserGroup.java @@ -15,7 +15,7 @@ public final class UserGroup { (com.google.protobuf.ExtensionRegistryLite) registry); } public interface ReqOnlineUserListOrBuilder extends - // @@protoc_insertion_point(interface_extends:proto.ReqOnlineUserList) + // @@protoc_insertion_point(interface_extends:net.sopod.soim.data.msg.user.ReqOnlineUserList) com.google.protobuf.MessageOrBuilder { /** @@ -43,11 +43,11 @@ public final class UserGroup { * 请求在线用户列表 * * - * Protobuf type {@code proto.ReqOnlineUserList} + * Protobuf type {@code net.sopod.soim.data.msg.user.ReqOnlineUserList} */ public static final class ReqOnlineUserList extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:proto.ReqOnlineUserList) + // @@protoc_insertion_point(message_implements:net.sopod.soim.data.msg.user.ReqOnlineUserList) ReqOnlineUserListOrBuilder { private static final long serialVersionUID = 0L; // Use ReqOnlineUserList.newBuilder() to construct. @@ -115,13 +115,13 @@ public final class UserGroup { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_ReqOnlineUserList_descriptor; + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_ReqOnlineUserList_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_ReqOnlineUserList_fieldAccessorTable + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_ReqOnlineUserList_fieldAccessorTable .ensureFieldAccessorsInitialized( net.sopod.soim.data.msg.user.UserGroup.ReqOnlineUserList.class, net.sopod.soim.data.msg.user.UserGroup.ReqOnlineUserList.Builder.class); } @@ -331,21 +331,21 @@ public final class UserGroup { * 请求在线用户列表 * * - * Protobuf type {@code proto.ReqOnlineUserList} + * Protobuf type {@code net.sopod.soim.data.msg.user.ReqOnlineUserList} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:proto.ReqOnlineUserList) + // @@protoc_insertion_point(builder_implements:net.sopod.soim.data.msg.user.ReqOnlineUserList) net.sopod.soim.data.msg.user.UserGroup.ReqOnlineUserListOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_ReqOnlineUserList_descriptor; + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_ReqOnlineUserList_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_ReqOnlineUserList_fieldAccessorTable + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_ReqOnlineUserList_fieldAccessorTable .ensureFieldAccessorsInitialized( net.sopod.soim.data.msg.user.UserGroup.ReqOnlineUserList.class, net.sopod.soim.data.msg.user.UserGroup.ReqOnlineUserList.Builder.class); } @@ -376,7 +376,7 @@ public final class UserGroup { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_ReqOnlineUserList_descriptor; + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_ReqOnlineUserList_descriptor; } @java.lang.Override @@ -586,10 +586,10 @@ public final class UserGroup { } - // @@protoc_insertion_point(builder_scope:proto.ReqOnlineUserList) + // @@protoc_insertion_point(builder_scope:net.sopod.soim.data.msg.user.ReqOnlineUserList) } - // @@protoc_insertion_point(class_scope:proto.ReqOnlineUserList) + // @@protoc_insertion_point(class_scope:net.sopod.soim.data.msg.user.ReqOnlineUserList) private static final net.sopod.soim.data.msg.user.UserGroup.ReqOnlineUserList DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new net.sopod.soim.data.msg.user.UserGroup.ReqOnlineUserList(); @@ -627,7 +627,7 @@ public final class UserGroup { } public interface ResOnlineUserListOrBuilder extends - // @@protoc_insertion_point(interface_extends:proto.ResOnlineUserList) + // @@protoc_insertion_point(interface_extends:net.sopod.soim.data.msg.user.ResOnlineUserList) com.google.protobuf.MessageOrBuilder { /** @@ -635,7 +635,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ java.util.List getUsersList(); @@ -644,7 +644,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ net.sopod.soim.data.msg.user.UserGroup.UserInfo getUsers(int index); /** @@ -652,7 +652,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ int getUsersCount(); /** @@ -660,7 +660,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ java.util.List getUsersOrBuilderList(); @@ -669,7 +669,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ net.sopod.soim.data.msg.user.UserGroup.UserInfoOrBuilder getUsersOrBuilder( int index); @@ -679,11 +679,11 @@ public final class UserGroup { * 响应在线用户列表 * * - * Protobuf type {@code proto.ResOnlineUserList} + * Protobuf type {@code net.sopod.soim.data.msg.user.ResOnlineUserList} */ public static final class ResOnlineUserList extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:proto.ResOnlineUserList) + // @@protoc_insertion_point(message_implements:net.sopod.soim.data.msg.user.ResOnlineUserList) ResOnlineUserListOrBuilder { private static final long serialVersionUID = 0L; // Use ResOnlineUserList.newBuilder() to construct. @@ -758,13 +758,13 @@ public final class UserGroup { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_ResOnlineUserList_descriptor; + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_ResOnlineUserList_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_ResOnlineUserList_fieldAccessorTable + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_ResOnlineUserList_fieldAccessorTable .ensureFieldAccessorsInitialized( net.sopod.soim.data.msg.user.UserGroup.ResOnlineUserList.class, net.sopod.soim.data.msg.user.UserGroup.ResOnlineUserList.Builder.class); } @@ -776,7 +776,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ @java.lang.Override public java.util.List getUsersList() { @@ -787,7 +787,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ @java.lang.Override public java.util.List @@ -799,7 +799,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ @java.lang.Override public int getUsersCount() { @@ -810,7 +810,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ @java.lang.Override public net.sopod.soim.data.msg.user.UserGroup.UserInfo getUsers(int index) { @@ -821,7 +821,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ @java.lang.Override public net.sopod.soim.data.msg.user.UserGroup.UserInfoOrBuilder getUsersOrBuilder( @@ -991,21 +991,21 @@ public final class UserGroup { * 响应在线用户列表 * * - * Protobuf type {@code proto.ResOnlineUserList} + * Protobuf type {@code net.sopod.soim.data.msg.user.ResOnlineUserList} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:proto.ResOnlineUserList) + // @@protoc_insertion_point(builder_implements:net.sopod.soim.data.msg.user.ResOnlineUserList) net.sopod.soim.data.msg.user.UserGroup.ResOnlineUserListOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_ResOnlineUserList_descriptor; + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_ResOnlineUserList_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_ResOnlineUserList_fieldAccessorTable + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_ResOnlineUserList_fieldAccessorTable .ensureFieldAccessorsInitialized( net.sopod.soim.data.msg.user.UserGroup.ResOnlineUserList.class, net.sopod.soim.data.msg.user.UserGroup.ResOnlineUserList.Builder.class); } @@ -1041,7 +1041,7 @@ public final class UserGroup { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_ResOnlineUserList_descriptor; + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_ResOnlineUserList_descriptor; } @java.lang.Override @@ -1192,7 +1192,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public java.util.List getUsersList() { if (usersBuilder_ == null) { @@ -1206,7 +1206,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public int getUsersCount() { if (usersBuilder_ == null) { @@ -1220,7 +1220,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public net.sopod.soim.data.msg.user.UserGroup.UserInfo getUsers(int index) { if (usersBuilder_ == null) { @@ -1234,7 +1234,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public Builder setUsers( int index, net.sopod.soim.data.msg.user.UserGroup.UserInfo value) { @@ -1255,7 +1255,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public Builder setUsers( int index, net.sopod.soim.data.msg.user.UserGroup.UserInfo.Builder builderForValue) { @@ -1273,7 +1273,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public Builder addUsers(net.sopod.soim.data.msg.user.UserGroup.UserInfo value) { if (usersBuilder_ == null) { @@ -1293,7 +1293,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public Builder addUsers( int index, net.sopod.soim.data.msg.user.UserGroup.UserInfo value) { @@ -1314,7 +1314,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public Builder addUsers( net.sopod.soim.data.msg.user.UserGroup.UserInfo.Builder builderForValue) { @@ -1332,7 +1332,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public Builder addUsers( int index, net.sopod.soim.data.msg.user.UserGroup.UserInfo.Builder builderForValue) { @@ -1350,7 +1350,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public Builder addAllUsers( java.lang.Iterable values) { @@ -1369,7 +1369,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public Builder clearUsers() { if (usersBuilder_ == null) { @@ -1386,7 +1386,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public Builder removeUsers(int index) { if (usersBuilder_ == null) { @@ -1403,7 +1403,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public net.sopod.soim.data.msg.user.UserGroup.UserInfo.Builder getUsersBuilder( int index) { @@ -1414,7 +1414,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public net.sopod.soim.data.msg.user.UserGroup.UserInfoOrBuilder getUsersOrBuilder( int index) { @@ -1428,7 +1428,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public java.util.List getUsersOrBuilderList() { @@ -1443,7 +1443,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public net.sopod.soim.data.msg.user.UserGroup.UserInfo.Builder addUsersBuilder() { return getUsersFieldBuilder().addBuilder( @@ -1454,7 +1454,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public net.sopod.soim.data.msg.user.UserGroup.UserInfo.Builder addUsersBuilder( int index) { @@ -1466,7 +1466,7 @@ public final class UserGroup { * 查询用户列表 * * - * repeated .proto.UserInfo users = 2; + * repeated .net.sopod.soim.data.msg.user.UserInfo users = 2; */ public java.util.List getUsersBuilderList() { @@ -1499,10 +1499,10 @@ public final class UserGroup { } - // @@protoc_insertion_point(builder_scope:proto.ResOnlineUserList) + // @@protoc_insertion_point(builder_scope:net.sopod.soim.data.msg.user.ResOnlineUserList) } - // @@protoc_insertion_point(class_scope:proto.ResOnlineUserList) + // @@protoc_insertion_point(class_scope:net.sopod.soim.data.msg.user.ResOnlineUserList) private static final net.sopod.soim.data.msg.user.UserGroup.ResOnlineUserList DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new net.sopod.soim.data.msg.user.UserGroup.ResOnlineUserList(); @@ -1540,7 +1540,7 @@ public final class UserGroup { } public interface UserInfoOrBuilder extends - // @@protoc_insertion_point(interface_extends:proto.UserInfo) + // @@protoc_insertion_point(interface_extends:net.sopod.soim.data.msg.user.UserInfo) com.google.protobuf.MessageOrBuilder { /** @@ -1562,11 +1562,11 @@ public final class UserGroup { getAccountBytes(); } /** - * Protobuf type {@code proto.UserInfo} + * Protobuf type {@code net.sopod.soim.data.msg.user.UserInfo} */ public static final class UserInfo extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:proto.UserInfo) + // @@protoc_insertion_point(message_implements:net.sopod.soim.data.msg.user.UserInfo) UserInfoOrBuilder { private static final long serialVersionUID = 0L; // Use UserInfo.newBuilder() to construct. @@ -1639,13 +1639,13 @@ public final class UserGroup { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_UserInfo_descriptor; + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_UserInfo_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_UserInfo_fieldAccessorTable + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_UserInfo_fieldAccessorTable .ensureFieldAccessorsInitialized( net.sopod.soim.data.msg.user.UserGroup.UserInfo.class, net.sopod.soim.data.msg.user.UserGroup.UserInfo.Builder.class); } @@ -1866,21 +1866,21 @@ public final class UserGroup { return builder; } /** - * Protobuf type {@code proto.UserInfo} + * Protobuf type {@code net.sopod.soim.data.msg.user.UserInfo} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:proto.UserInfo) + // @@protoc_insertion_point(builder_implements:net.sopod.soim.data.msg.user.UserInfo) net.sopod.soim.data.msg.user.UserGroup.UserInfoOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_UserInfo_descriptor; + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_UserInfo_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_UserInfo_fieldAccessorTable + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_UserInfo_fieldAccessorTable .ensureFieldAccessorsInitialized( net.sopod.soim.data.msg.user.UserGroup.UserInfo.class, net.sopod.soim.data.msg.user.UserGroup.UserInfo.Builder.class); } @@ -1913,7 +1913,7 @@ public final class UserGroup { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return net.sopod.soim.data.msg.user.UserGroup.internal_static_proto_UserInfo_descriptor; + return net.sopod.soim.data.msg.user.UserGroup.internal_static_net_sopod_soim_data_msg_user_UserInfo_descriptor; } @java.lang.Override @@ -2138,10 +2138,10 @@ public final class UserGroup { } - // @@protoc_insertion_point(builder_scope:proto.UserInfo) + // @@protoc_insertion_point(builder_scope:net.sopod.soim.data.msg.user.UserInfo) } - // @@protoc_insertion_point(class_scope:proto.UserInfo) + // @@protoc_insertion_point(class_scope:net.sopod.soim.data.msg.user.UserInfo) private static final net.sopod.soim.data.msg.user.UserGroup.UserInfo DEFAULT_INSTANCE; static { DEFAULT_INSTANCE = new net.sopod.soim.data.msg.user.UserGroup.UserInfo(); @@ -2179,20 +2179,20 @@ public final class UserGroup { } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_proto_ReqOnlineUserList_descriptor; + internal_static_net_sopod_soim_data_msg_user_ReqOnlineUserList_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_proto_ReqOnlineUserList_fieldAccessorTable; + internal_static_net_sopod_soim_data_msg_user_ReqOnlineUserList_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_proto_ResOnlineUserList_descriptor; + internal_static_net_sopod_soim_data_msg_user_ResOnlineUserList_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_proto_ResOnlineUserList_fieldAccessorTable; + internal_static_net_sopod_soim_data_msg_user_ResOnlineUserList_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor - internal_static_proto_UserInfo_descriptor; + internal_static_net_sopod_soim_data_msg_user_UserInfo_descriptor; private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_proto_UserInfo_fieldAccessorTable; + internal_static_net_sopod_soim_data_msg_user_UserInfo_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -2202,34 +2202,35 @@ public final class UserGroup { descriptor; static { java.lang.String[] descriptorData = { - "\n\032proto/user/UserGroup.proto\022\005proto\"$\n\021R" + - "eqOnlineUserList\022\017\n\007keyword\030\002 \001(\t\"3\n\021Res" + - "OnlineUserList\022\036\n\005users\030\002 \003(\0132\017.proto.Us" + - "erInfo\"(\n\010UserInfo\022\013\n\003uid\030\001 \001(\003\022\017\n\007accou" + - "nt\030\002 \001(\tB+\n\034net.sopod.soim.data.msg.user" + - "B\tUserGroupP\000b\006proto3" + "\n\032proto/user/UserGroup.proto\022\034net.sopod." + + "soim.data.msg.user\"$\n\021ReqOnlineUserList\022" + + "\017\n\007keyword\030\002 \001(\t\"J\n\021ResOnlineUserList\0225\n" + + "\005users\030\002 \003(\0132&.net.sopod.soim.data.msg.u" + + "ser.UserInfo\"(\n\010UserInfo\022\013\n\003uid\030\001 \001(\003\022\017\n" + + "\007account\030\002 \001(\tB+\n\034net.sopod.soim.data.ms" + + "g.userB\tUserGroupP\000b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { }); - internal_static_proto_ReqOnlineUserList_descriptor = + internal_static_net_sopod_soim_data_msg_user_ReqOnlineUserList_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_proto_ReqOnlineUserList_fieldAccessorTable = new + internal_static_net_sopod_soim_data_msg_user_ReqOnlineUserList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_proto_ReqOnlineUserList_descriptor, + internal_static_net_sopod_soim_data_msg_user_ReqOnlineUserList_descriptor, new java.lang.String[] { "Keyword", }); - internal_static_proto_ResOnlineUserList_descriptor = + internal_static_net_sopod_soim_data_msg_user_ResOnlineUserList_descriptor = getDescriptor().getMessageTypes().get(1); - internal_static_proto_ResOnlineUserList_fieldAccessorTable = new + internal_static_net_sopod_soim_data_msg_user_ResOnlineUserList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_proto_ResOnlineUserList_descriptor, + internal_static_net_sopod_soim_data_msg_user_ResOnlineUserList_descriptor, new java.lang.String[] { "Users", }); - internal_static_proto_UserInfo_descriptor = + internal_static_net_sopod_soim_data_msg_user_UserInfo_descriptor = getDescriptor().getMessageTypes().get(2); - internal_static_proto_UserInfo_fieldAccessorTable = new + internal_static_net_sopod_soim_data_msg_user_UserInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_proto_UserInfo_descriptor, + internal_static_net_sopod_soim_data_msg_user_UserInfo_descriptor, new java.lang.String[] { "Uid", "Account", }); } diff --git a/im-service-api/im-entry-protocol/src/main/resources/proto/friend/Friend.proto b/im-service-api/im-entry-protocol/src/main/resources/proto/friend/Friend.proto new file mode 100644 index 0000000..7881446 --- /dev/null +++ b/im-service-api/im-entry-protocol/src/main/resources/proto/friend/Friend.proto @@ -0,0 +1,19 @@ +syntax="proto3"; + +option java_multiple_files = false; +option java_outer_classname = "Friend"; +option java_package = "net.sopod.soim.data.msg.friend"; + +package net.sopod.soim.data.msg.friend; + +message ReqFriendSearch { + string keyword = 1; +} +message ResFriendSearch { + repeated UserInfo users = 8; +} +message UserInfo { + int64 uid = 1; + string account = 2; + string nickname = 3; +} diff --git a/im-service-api/im-entry-protocol/src/main/resources/proto/user/UserGroup.proto b/im-service-api/im-entry-protocol/src/main/resources/proto/user/UserGroup.proto index d09f694..dfab1d2 100644 --- a/im-service-api/im-entry-protocol/src/main/resources/proto/user/UserGroup.proto +++ b/im-service-api/im-entry-protocol/src/main/resources/proto/user/UserGroup.proto @@ -1,5 +1,5 @@ syntax="proto3"; -package proto; +package net.sopod.soim.data.msg.user; option java_multiple_files = false; option java_outer_classname = "UserGroup"; diff --git a/im-service-api/im-entry-protocol/src/main/resources/protoSerialNoTable.txt b/im-service-api/im-entry-protocol/src/main/resources/protoSerialNoTable.txt index 97e5624..7f8f487 100644 --- a/im-service-api/im-entry-protocol/src/main/resources/protoSerialNoTable.txt +++ b/im-service-api/im-entry-protocol/src/main/resources/protoSerialNoTable.txt @@ -1,11 +1,14 @@ -net.sopod.soim.data.msg.user.UserGroup$ResOnlineUserList=10000 -net.sopod.soim.data.msg.net.HeartBeat$Pong=10001 -net.sopod.soim.data.msg.chat.Chat$TextChat=10002 -net.sopod.soim.data.msg.task.Tasks$NetUserDelayCloseTask=10003 -net.sopod.soim.data.msg.auth.Auth$ResTokenAuth=10004 -net.sopod.soim.data.msg.hello.HelloPB$Hello=10005 -net.sopod.soim.data.msg.hello.HelloPB$World=10006 -net.sopod.soim.data.msg.auth.Auth$ReqTokenAuth=10007 +net.sopod.soim.data.msg.net.HeartBeat$Ping=10000 +net.sopod.soim.data.msg.auth.Auth$ResTokenAuth=10001 +net.sopod.soim.data.msg.task.Tasks$NetUserDelayCloseTask=10002 +net.sopod.soim.data.msg.friend.Friend$ResFriendSearch=10003 +net.sopod.soim.data.msg.hello.HelloPB$Hello=10004 +net.sopod.soim.data.msg.user.UserGroup$ResOnlineUserList=10005 +net.sopod.soim.data.msg.friend.Friend$ReqFriendSearch=10006 +net.sopod.soim.data.msg.friend.Friend$UserInfo=10007 net.sopod.soim.data.msg.user.UserGroup$UserInfo=10008 net.sopod.soim.data.msg.user.UserGroup$ReqOnlineUserList=10009 -net.sopod.soim.data.msg.net.HeartBeat$Ping=10010 +net.sopod.soim.data.msg.auth.Auth$ReqTokenAuth=10010 +net.sopod.soim.data.msg.net.HeartBeat$Pong=10011 +net.sopod.soim.data.msg.chat.Chat$TextChat=10012 +net.sopod.soim.data.msg.hello.HelloPB$World=10013 diff --git a/im-service-api/im-logic-common/src/main/resources/proto/message.proto b/im-service-api/im-logic-common/src/main/resources/proto/message.proto deleted file mode 100644 index bc771bb..0000000 --- a/im-service-api/im-logic-common/src/main/resources/proto/message.proto +++ /dev/null @@ -1,19 +0,0 @@ -syntax = "proto3"; - -option java_multiple_files = true; - -package net.sopod.soim.logic.common.message; - -message UserSearchReq { - string keyword = 1; -} - -message UserSearchReply { - repeated UserInfo users = 1; -} - -message UserInfo { - int64 uid = 1; - string account = 2; - string nickname = 3; -} diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserInfo.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountInfo.java similarity index 82% rename from im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserInfo.java rename to im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountInfo.java index e55a4e7..4407840 100644 --- a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserInfo.java +++ b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountInfo.java @@ -1,21 +1,21 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto/UserSearch.proto +// source: proto/AccountSearch.proto package net.sopod.soim.logic.api.friend.search; /** - * Protobuf type {@code net.sopod.soim.logic.api.friend.search.UserInfo} + * Protobuf type {@code net.sopod.soim.logic.api.friend.search.AccountInfo} */ -public final class UserInfo extends +public final class AccountInfo extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:net.sopod.soim.logic.api.friend.search.UserInfo) - UserInfoOrBuilder { + // @@protoc_insertion_point(message_implements:net.sopod.soim.logic.api.friend.search.AccountInfo) + AccountInfoOrBuilder { private static final long serialVersionUID = 0L; - // Use UserInfo.newBuilder() to construct. - private UserInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use AccountInfo.newBuilder() to construct. + private AccountInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private UserInfo() { + private AccountInfo() { account_ = ""; nickname_ = ""; } @@ -24,7 +24,7 @@ private static final long serialVersionUID = 0L; @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new UserInfo(); + return new AccountInfo(); } @java.lang.Override @@ -32,7 +32,7 @@ private static final long serialVersionUID = 0L; getUnknownFields() { return this.unknownFields; } - private UserInfo( + private AccountInfo( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -88,15 +88,15 @@ private static final long serialVersionUID = 0L; } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserInfo_descriptor; + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_AccountInfo_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserInfo_fieldAccessorTable + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_AccountInfo_fieldAccessorTable .ensureFieldAccessorsInitialized( - net.sopod.soim.logic.api.friend.search.UserInfo.class, net.sopod.soim.logic.api.friend.search.UserInfo.Builder.class); + net.sopod.soim.logic.api.friend.search.AccountInfo.class, net.sopod.soim.logic.api.friend.search.AccountInfo.Builder.class); } public static final int UID_FIELD_NUMBER = 1; @@ -238,10 +238,10 @@ private static final long serialVersionUID = 0L; if (obj == this) { return true; } - if (!(obj instanceof net.sopod.soim.logic.api.friend.search.UserInfo)) { + if (!(obj instanceof net.sopod.soim.logic.api.friend.search.AccountInfo)) { return super.equals(obj); } - net.sopod.soim.logic.api.friend.search.UserInfo other = (net.sopod.soim.logic.api.friend.search.UserInfo) obj; + net.sopod.soim.logic.api.friend.search.AccountInfo other = (net.sopod.soim.logic.api.friend.search.AccountInfo) obj; if (getUid() != other.getUid()) return false; @@ -272,69 +272,69 @@ private static final long serialVersionUID = 0L; return hash; } - public static net.sopod.soim.logic.api.friend.search.UserInfo parseFrom( + public static net.sopod.soim.logic.api.friend.search.AccountInfo parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static net.sopod.soim.logic.api.friend.search.UserInfo parseFrom( + public static net.sopod.soim.logic.api.friend.search.AccountInfo parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static net.sopod.soim.logic.api.friend.search.UserInfo parseFrom( + public static net.sopod.soim.logic.api.friend.search.AccountInfo parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static net.sopod.soim.logic.api.friend.search.UserInfo parseFrom( + public static net.sopod.soim.logic.api.friend.search.AccountInfo parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static net.sopod.soim.logic.api.friend.search.UserInfo parseFrom(byte[] data) + public static net.sopod.soim.logic.api.friend.search.AccountInfo parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static net.sopod.soim.logic.api.friend.search.UserInfo parseFrom( + public static net.sopod.soim.logic.api.friend.search.AccountInfo parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static net.sopod.soim.logic.api.friend.search.UserInfo parseFrom(java.io.InputStream input) + public static net.sopod.soim.logic.api.friend.search.AccountInfo parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static net.sopod.soim.logic.api.friend.search.UserInfo parseFrom( + public static net.sopod.soim.logic.api.friend.search.AccountInfo 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 net.sopod.soim.logic.api.friend.search.UserInfo parseDelimitedFrom(java.io.InputStream input) + public static net.sopod.soim.logic.api.friend.search.AccountInfo parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static net.sopod.soim.logic.api.friend.search.UserInfo parseDelimitedFrom( + public static net.sopod.soim.logic.api.friend.search.AccountInfo 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 net.sopod.soim.logic.api.friend.search.UserInfo parseFrom( + public static net.sopod.soim.logic.api.friend.search.AccountInfo parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static net.sopod.soim.logic.api.friend.search.UserInfo parseFrom( + public static net.sopod.soim.logic.api.friend.search.AccountInfo parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -347,7 +347,7 @@ private static final long serialVersionUID = 0L; public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(net.sopod.soim.logic.api.friend.search.UserInfo prototype) { + public static Builder newBuilder(net.sopod.soim.logic.api.friend.search.AccountInfo prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -363,26 +363,26 @@ private static final long serialVersionUID = 0L; return builder; } /** - * Protobuf type {@code net.sopod.soim.logic.api.friend.search.UserInfo} + * Protobuf type {@code net.sopod.soim.logic.api.friend.search.AccountInfo} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:net.sopod.soim.logic.api.friend.search.UserInfo) - net.sopod.soim.logic.api.friend.search.UserInfoOrBuilder { + // @@protoc_insertion_point(builder_implements:net.sopod.soim.logic.api.friend.search.AccountInfo) + net.sopod.soim.logic.api.friend.search.AccountInfoOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserInfo_descriptor; + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_AccountInfo_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserInfo_fieldAccessorTable + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_AccountInfo_fieldAccessorTable .ensureFieldAccessorsInitialized( - net.sopod.soim.logic.api.friend.search.UserInfo.class, net.sopod.soim.logic.api.friend.search.UserInfo.Builder.class); + net.sopod.soim.logic.api.friend.search.AccountInfo.class, net.sopod.soim.logic.api.friend.search.AccountInfo.Builder.class); } - // Construct using net.sopod.soim.logic.api.friend.search.UserInfo.newBuilder() + // Construct using net.sopod.soim.logic.api.friend.search.AccountInfo.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -412,17 +412,17 @@ private static final long serialVersionUID = 0L; @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserInfo_descriptor; + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_AccountInfo_descriptor; } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserInfo getDefaultInstanceForType() { - return net.sopod.soim.logic.api.friend.search.UserInfo.getDefaultInstance(); + public net.sopod.soim.logic.api.friend.search.AccountInfo getDefaultInstanceForType() { + return net.sopod.soim.logic.api.friend.search.AccountInfo.getDefaultInstance(); } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserInfo build() { - net.sopod.soim.logic.api.friend.search.UserInfo result = buildPartial(); + public net.sopod.soim.logic.api.friend.search.AccountInfo build() { + net.sopod.soim.logic.api.friend.search.AccountInfo result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -430,8 +430,8 @@ private static final long serialVersionUID = 0L; } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserInfo buildPartial() { - net.sopod.soim.logic.api.friend.search.UserInfo result = new net.sopod.soim.logic.api.friend.search.UserInfo(this); + public net.sopod.soim.logic.api.friend.search.AccountInfo buildPartial() { + net.sopod.soim.logic.api.friend.search.AccountInfo result = new net.sopod.soim.logic.api.friend.search.AccountInfo(this); result.uid_ = uid_; result.account_ = account_; result.nickname_ = nickname_; @@ -473,16 +473,16 @@ private static final long serialVersionUID = 0L; } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof net.sopod.soim.logic.api.friend.search.UserInfo) { - return mergeFrom((net.sopod.soim.logic.api.friend.search.UserInfo)other); + if (other instanceof net.sopod.soim.logic.api.friend.search.AccountInfo) { + return mergeFrom((net.sopod.soim.logic.api.friend.search.AccountInfo)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(net.sopod.soim.logic.api.friend.search.UserInfo other) { - if (other == net.sopod.soim.logic.api.friend.search.UserInfo.getDefaultInstance()) return this; + public Builder mergeFrom(net.sopod.soim.logic.api.friend.search.AccountInfo other) { + if (other == net.sopod.soim.logic.api.friend.search.AccountInfo.getDefaultInstance()) return this; if (other.getUid() != 0L) { setUid(other.getUid()); } @@ -509,11 +509,11 @@ private static final long serialVersionUID = 0L; com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - net.sopod.soim.logic.api.friend.search.UserInfo parsedMessage = null; + net.sopod.soim.logic.api.friend.search.AccountInfo parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (net.sopod.soim.logic.api.friend.search.UserInfo) e.getUnfinishedMessage(); + parsedMessage = (net.sopod.soim.logic.api.friend.search.AccountInfo) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -718,41 +718,41 @@ private static final long serialVersionUID = 0L; } - // @@protoc_insertion_point(builder_scope:net.sopod.soim.logic.api.friend.search.UserInfo) + // @@protoc_insertion_point(builder_scope:net.sopod.soim.logic.api.friend.search.AccountInfo) } - // @@protoc_insertion_point(class_scope:net.sopod.soim.logic.api.friend.search.UserInfo) - private static final net.sopod.soim.logic.api.friend.search.UserInfo DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:net.sopod.soim.logic.api.friend.search.AccountInfo) + private static final net.sopod.soim.logic.api.friend.search.AccountInfo DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new net.sopod.soim.logic.api.friend.search.UserInfo(); + DEFAULT_INSTANCE = new net.sopod.soim.logic.api.friend.search.AccountInfo(); } - public static net.sopod.soim.logic.api.friend.search.UserInfo getDefaultInstance() { + public static net.sopod.soim.logic.api.friend.search.AccountInfo getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public UserInfo parsePartialFrom( + public AccountInfo parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new UserInfo(input, extensionRegistry); + return new AccountInfo(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserInfo getDefaultInstanceForType() { + public net.sopod.soim.logic.api.friend.search.AccountInfo getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserInfoOrBuilder.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountInfoOrBuilder.java similarity index 87% rename from im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserInfoOrBuilder.java rename to im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountInfoOrBuilder.java index 921f614..a3e0f16 100644 --- a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserInfoOrBuilder.java +++ b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountInfoOrBuilder.java @@ -1,10 +1,10 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto/UserSearch.proto +// source: proto/AccountSearch.proto package net.sopod.soim.logic.api.friend.search; -public interface UserInfoOrBuilder extends - // @@protoc_insertion_point(interface_extends:net.sopod.soim.logic.api.friend.search.UserInfo) +public interface AccountInfoOrBuilder extends + // @@protoc_insertion_point(interface_extends:net.sopod.soim.logic.api.friend.search.AccountInfo) com.google.protobuf.MessageOrBuilder { /** diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountSearch.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountSearch.java new file mode 100644 index 0000000..3ede02f --- /dev/null +++ b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountSearch.java @@ -0,0 +1,78 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto/AccountSearch.proto + +package net.sopod.soim.logic.api.friend.search; + +public final class AccountSearch { + private AccountSearch() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + static final com.google.protobuf.Descriptors.Descriptor + internal_static_net_sopod_soim_logic_api_friend_search_ReqAccountSearch_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_net_sopod_soim_logic_api_friend_search_ReqAccountSearch_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_net_sopod_soim_logic_api_friend_search_ResAccountSearch_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_net_sopod_soim_logic_api_friend_search_ResAccountSearch_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_net_sopod_soim_logic_api_friend_search_AccountInfo_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_net_sopod_soim_logic_api_friend_search_AccountInfo_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\031proto/AccountSearch.proto\022&net.sopod.s" + + "oim.logic.api.friend.search\"#\n\020ReqAccoun" + + "tSearch\022\017\n\007keyword\030\001 \001(\t\"Y\n\020ResAccountSe" + + "arch\022E\n\010accounts\030\001 \003(\01323.net.sopod.soim." + + "logic.api.friend.search.AccountInfo\"=\n\013A" + + "ccountInfo\022\013\n\003uid\030\001 \001(\003\022\017\n\007account\030\002 \001(\t" + + "\022\020\n\010nickname\030\003 \001(\t2\244\001\n\024AccountSearchServ" + + "ice\022\213\001\n\023searchAccountLikely\0228.net.sopod." + + "soim.logic.api.friend.search.ReqAccountS" + + "earch\0328.net.sopod.soim.logic.api.friend." + + "search.ResAccountSearch\"\000B\002P\001b\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_net_sopod_soim_logic_api_friend_search_ReqAccountSearch_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_net_sopod_soim_logic_api_friend_search_ReqAccountSearch_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_net_sopod_soim_logic_api_friend_search_ReqAccountSearch_descriptor, + new java.lang.String[] { "Keyword", }); + internal_static_net_sopod_soim_logic_api_friend_search_ResAccountSearch_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_net_sopod_soim_logic_api_friend_search_ResAccountSearch_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_net_sopod_soim_logic_api_friend_search_ResAccountSearch_descriptor, + new java.lang.String[] { "Accounts", }); + internal_static_net_sopod_soim_logic_api_friend_search_AccountInfo_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_net_sopod_soim_logic_api_friend_search_AccountInfo_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_net_sopod_soim_logic_api_friend_search_AccountInfo_descriptor, + new java.lang.String[] { "Uid", "Account", "Nickname", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountSearchService.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountSearchService.java new file mode 100644 index 0000000..e087971 --- /dev/null +++ b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountSearchService.java @@ -0,0 +1,21 @@ + package net.sopod.soim.logic.api.friend.search; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicBoolean; + +@javax.annotation.Generated( +value = "by Dubbo generator", +comments = "Source: proto/AccountSearch.proto") +public interface AccountSearchService { +static final String JAVA_SERVICE_NAME = "net.sopod.soim.logic.api.friend.search.AccountSearchService"; +static final String SERVICE_NAME = "net.sopod.soim.logic.api.friend.search.AccountSearchService"; + + // FIXME, initialize Dubbo3 stub when interface loaded, thinking of new ways doing this. + static final boolean inited = AccountSearchServiceDubbo.init(); + + net.sopod.soim.logic.api.friend.search.ResAccountSearch searchAccountLikely(net.sopod.soim.logic.api.friend.search.ReqAccountSearch request); + + CompletableFuture searchAccountLikelyAsync(net.sopod.soim.logic.api.friend.search.ReqAccountSearch request); + + +} diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchServiceDubbo.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountSearchServiceDubbo.java similarity index 64% rename from im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchServiceDubbo.java rename to im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountSearchServiceDubbo.java index 91309d9..fa08a93 100644 --- a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchServiceDubbo.java +++ b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/AccountSearchServiceDubbo.java @@ -5,20 +5,20 @@ import java.util.concurrent.atomic.AtomicBoolean; @javax.annotation.Generated( value = "by Dubbo generator", -comments = "Source: proto/UserSearch.proto") -public final class UserSearchServiceDubbo { +comments = "Source: proto/AccountSearch.proto") +public final class AccountSearchServiceDubbo { private static final AtomicBoolean registered = new AtomicBoolean(); public static boolean init() { if (registered.compareAndSet(false, true)) { org.apache.dubbo.common.serialize.protobuf.support.ProtobufUtils.marshaller( - net.sopod.soim.logic.api.friend.search.UserSearchReq.getDefaultInstance()); + net.sopod.soim.logic.api.friend.search.ReqAccountSearch.getDefaultInstance()); org.apache.dubbo.common.serialize.protobuf.support.ProtobufUtils.marshaller( - net.sopod.soim.logic.api.friend.search.UserSearchReply.getDefaultInstance()); + net.sopod.soim.logic.api.friend.search.ResAccountSearch.getDefaultInstance()); } return true; } -private UserSearchServiceDubbo() {} +private AccountSearchServiceDubbo() {} } diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReq.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ReqAccountSearch.java similarity index 75% rename from im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReq.java rename to im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ReqAccountSearch.java index cc0fc12..13048d2 100644 --- a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReq.java +++ b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ReqAccountSearch.java @@ -1,21 +1,21 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto/UserSearch.proto +// source: proto/AccountSearch.proto package net.sopod.soim.logic.api.friend.search; /** - * Protobuf type {@code net.sopod.soim.logic.api.friend.search.UserSearchReq} + * Protobuf type {@code net.sopod.soim.logic.api.friend.search.ReqAccountSearch} */ -public final class UserSearchReq extends +public final class ReqAccountSearch extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:net.sopod.soim.logic.api.friend.search.UserSearchReq) - UserSearchReqOrBuilder { + // @@protoc_insertion_point(message_implements:net.sopod.soim.logic.api.friend.search.ReqAccountSearch) + ReqAccountSearchOrBuilder { private static final long serialVersionUID = 0L; - // Use UserSearchReq.newBuilder() to construct. - private UserSearchReq(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use ReqAccountSearch.newBuilder() to construct. + private ReqAccountSearch(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private UserSearchReq() { + private ReqAccountSearch() { keyword_ = ""; } @@ -23,7 +23,7 @@ private static final long serialVersionUID = 0L; @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new UserSearchReq(); + return new ReqAccountSearch(); } @java.lang.Override @@ -31,7 +31,7 @@ private static final long serialVersionUID = 0L; getUnknownFields() { return this.unknownFields; } - private UserSearchReq( + private ReqAccountSearch( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -76,15 +76,15 @@ private static final long serialVersionUID = 0L; } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReq_descriptor; + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_ReqAccountSearch_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReq_fieldAccessorTable + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_ReqAccountSearch_fieldAccessorTable .ensureFieldAccessorsInitialized( - net.sopod.soim.logic.api.friend.search.UserSearchReq.class, net.sopod.soim.logic.api.friend.search.UserSearchReq.Builder.class); + net.sopod.soim.logic.api.friend.search.ReqAccountSearch.class, net.sopod.soim.logic.api.friend.search.ReqAccountSearch.Builder.class); } public static final int KEYWORD_FIELD_NUMBER = 1; @@ -164,10 +164,10 @@ private static final long serialVersionUID = 0L; if (obj == this) { return true; } - if (!(obj instanceof net.sopod.soim.logic.api.friend.search.UserSearchReq)) { + if (!(obj instanceof net.sopod.soim.logic.api.friend.search.ReqAccountSearch)) { return super.equals(obj); } - net.sopod.soim.logic.api.friend.search.UserSearchReq other = (net.sopod.soim.logic.api.friend.search.UserSearchReq) obj; + net.sopod.soim.logic.api.friend.search.ReqAccountSearch other = (net.sopod.soim.logic.api.friend.search.ReqAccountSearch) obj; if (!getKeyword() .equals(other.getKeyword())) return false; @@ -189,69 +189,69 @@ private static final long serialVersionUID = 0L; return hash; } - public static net.sopod.soim.logic.api.friend.search.UserSearchReq parseFrom( + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReq parseFrom( + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReq parseFrom( + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReq parseFrom( + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReq parseFrom(byte[] data) + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReq parseFrom( + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReq parseFrom(java.io.InputStream input) + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReq parseFrom( + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch 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 net.sopod.soim.logic.api.friend.search.UserSearchReq parseDelimitedFrom(java.io.InputStream input) + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReq parseDelimitedFrom( + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch 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 net.sopod.soim.logic.api.friend.search.UserSearchReq parseFrom( + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReq parseFrom( + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -264,7 +264,7 @@ private static final long serialVersionUID = 0L; public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(net.sopod.soim.logic.api.friend.search.UserSearchReq prototype) { + public static Builder newBuilder(net.sopod.soim.logic.api.friend.search.ReqAccountSearch prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -280,26 +280,26 @@ private static final long serialVersionUID = 0L; return builder; } /** - * Protobuf type {@code net.sopod.soim.logic.api.friend.search.UserSearchReq} + * Protobuf type {@code net.sopod.soim.logic.api.friend.search.ReqAccountSearch} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:net.sopod.soim.logic.api.friend.search.UserSearchReq) - net.sopod.soim.logic.api.friend.search.UserSearchReqOrBuilder { + // @@protoc_insertion_point(builder_implements:net.sopod.soim.logic.api.friend.search.ReqAccountSearch) + net.sopod.soim.logic.api.friend.search.ReqAccountSearchOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReq_descriptor; + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_ReqAccountSearch_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReq_fieldAccessorTable + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_ReqAccountSearch_fieldAccessorTable .ensureFieldAccessorsInitialized( - net.sopod.soim.logic.api.friend.search.UserSearchReq.class, net.sopod.soim.logic.api.friend.search.UserSearchReq.Builder.class); + net.sopod.soim.logic.api.friend.search.ReqAccountSearch.class, net.sopod.soim.logic.api.friend.search.ReqAccountSearch.Builder.class); } - // Construct using net.sopod.soim.logic.api.friend.search.UserSearchReq.newBuilder() + // Construct using net.sopod.soim.logic.api.friend.search.ReqAccountSearch.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -325,17 +325,17 @@ private static final long serialVersionUID = 0L; @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReq_descriptor; + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_ReqAccountSearch_descriptor; } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserSearchReq getDefaultInstanceForType() { - return net.sopod.soim.logic.api.friend.search.UserSearchReq.getDefaultInstance(); + public net.sopod.soim.logic.api.friend.search.ReqAccountSearch getDefaultInstanceForType() { + return net.sopod.soim.logic.api.friend.search.ReqAccountSearch.getDefaultInstance(); } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserSearchReq build() { - net.sopod.soim.logic.api.friend.search.UserSearchReq result = buildPartial(); + public net.sopod.soim.logic.api.friend.search.ReqAccountSearch build() { + net.sopod.soim.logic.api.friend.search.ReqAccountSearch result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -343,8 +343,8 @@ private static final long serialVersionUID = 0L; } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserSearchReq buildPartial() { - net.sopod.soim.logic.api.friend.search.UserSearchReq result = new net.sopod.soim.logic.api.friend.search.UserSearchReq(this); + public net.sopod.soim.logic.api.friend.search.ReqAccountSearch buildPartial() { + net.sopod.soim.logic.api.friend.search.ReqAccountSearch result = new net.sopod.soim.logic.api.friend.search.ReqAccountSearch(this); result.keyword_ = keyword_; onBuilt(); return result; @@ -384,16 +384,16 @@ private static final long serialVersionUID = 0L; } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof net.sopod.soim.logic.api.friend.search.UserSearchReq) { - return mergeFrom((net.sopod.soim.logic.api.friend.search.UserSearchReq)other); + if (other instanceof net.sopod.soim.logic.api.friend.search.ReqAccountSearch) { + return mergeFrom((net.sopod.soim.logic.api.friend.search.ReqAccountSearch)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(net.sopod.soim.logic.api.friend.search.UserSearchReq other) { - if (other == net.sopod.soim.logic.api.friend.search.UserSearchReq.getDefaultInstance()) return this; + public Builder mergeFrom(net.sopod.soim.logic.api.friend.search.ReqAccountSearch other) { + if (other == net.sopod.soim.logic.api.friend.search.ReqAccountSearch.getDefaultInstance()) return this; if (!other.getKeyword().isEmpty()) { keyword_ = other.keyword_; onChanged(); @@ -413,11 +413,11 @@ private static final long serialVersionUID = 0L; com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - net.sopod.soim.logic.api.friend.search.UserSearchReq parsedMessage = null; + net.sopod.soim.logic.api.friend.search.ReqAccountSearch parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (net.sopod.soim.logic.api.friend.search.UserSearchReq) e.getUnfinishedMessage(); + parsedMessage = (net.sopod.soim.logic.api.friend.search.ReqAccountSearch) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -515,41 +515,41 @@ private static final long serialVersionUID = 0L; } - // @@protoc_insertion_point(builder_scope:net.sopod.soim.logic.api.friend.search.UserSearchReq) + // @@protoc_insertion_point(builder_scope:net.sopod.soim.logic.api.friend.search.ReqAccountSearch) } - // @@protoc_insertion_point(class_scope:net.sopod.soim.logic.api.friend.search.UserSearchReq) - private static final net.sopod.soim.logic.api.friend.search.UserSearchReq DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:net.sopod.soim.logic.api.friend.search.ReqAccountSearch) + private static final net.sopod.soim.logic.api.friend.search.ReqAccountSearch DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new net.sopod.soim.logic.api.friend.search.UserSearchReq(); + DEFAULT_INSTANCE = new net.sopod.soim.logic.api.friend.search.ReqAccountSearch(); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReq getDefaultInstance() { + public static net.sopod.soim.logic.api.friend.search.ReqAccountSearch getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public UserSearchReq parsePartialFrom( + public ReqAccountSearch parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new UserSearchReq(input, extensionRegistry); + return new ReqAccountSearch(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserSearchReq getDefaultInstanceForType() { + public net.sopod.soim.logic.api.friend.search.ReqAccountSearch getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReqOrBuilder.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ReqAccountSearchOrBuilder.java similarity index 78% rename from im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReqOrBuilder.java rename to im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ReqAccountSearchOrBuilder.java index 6f625b8..0a52e6d 100644 --- a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReqOrBuilder.java +++ b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ReqAccountSearchOrBuilder.java @@ -1,10 +1,10 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto/UserSearch.proto +// source: proto/AccountSearch.proto package net.sopod.soim.logic.api.friend.search; -public interface UserSearchReqOrBuilder extends - // @@protoc_insertion_point(interface_extends:net.sopod.soim.logic.api.friend.search.UserSearchReq) +public interface ReqAccountSearchOrBuilder extends + // @@protoc_insertion_point(interface_extends:net.sopod.soim.logic.api.friend.search.ReqAccountSearch) com.google.protobuf.MessageOrBuilder { /** diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReply.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ResAccountSearch.java similarity index 50% rename from im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReply.java rename to im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ResAccountSearch.java index 7577e0d..0419961 100644 --- a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReply.java +++ b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ResAccountSearch.java @@ -1,29 +1,29 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto/UserSearch.proto +// source: proto/AccountSearch.proto package net.sopod.soim.logic.api.friend.search; /** - * Protobuf type {@code net.sopod.soim.logic.api.friend.search.UserSearchReply} + * Protobuf type {@code net.sopod.soim.logic.api.friend.search.ResAccountSearch} */ -public final class UserSearchReply extends +public final class ResAccountSearch extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:net.sopod.soim.logic.api.friend.search.UserSearchReply) - UserSearchReplyOrBuilder { + // @@protoc_insertion_point(message_implements:net.sopod.soim.logic.api.friend.search.ResAccountSearch) + ResAccountSearchOrBuilder { private static final long serialVersionUID = 0L; - // Use UserSearchReply.newBuilder() to construct. - private UserSearchReply(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use ResAccountSearch.newBuilder() to construct. + private ResAccountSearch(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private UserSearchReply() { - users_ = java.util.Collections.emptyList(); + private ResAccountSearch() { + accounts_ = java.util.Collections.emptyList(); } @java.lang.Override @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new UserSearchReply(); + return new ResAccountSearch(); } @java.lang.Override @@ -31,7 +31,7 @@ private static final long serialVersionUID = 0L; getUnknownFields() { return this.unknownFields; } - private UserSearchReply( + private ResAccountSearch( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -52,11 +52,11 @@ private static final long serialVersionUID = 0L; break; case 10: { if (!((mutable_bitField0_ & 0x00000001) != 0)) { - users_ = new java.util.ArrayList(); + accounts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - users_.add( - input.readMessage(net.sopod.soim.logic.api.friend.search.UserInfo.parser(), extensionRegistry)); + accounts_.add( + input.readMessage(net.sopod.soim.logic.api.friend.search.AccountInfo.parser(), extensionRegistry)); break; } default: { @@ -75,7 +75,7 @@ private static final long serialVersionUID = 0L; e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - users_ = java.util.Collections.unmodifiableList(users_); + accounts_ = java.util.Collections.unmodifiableList(accounts_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -83,55 +83,55 @@ private static final long serialVersionUID = 0L; } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReply_descriptor; + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_ResAccountSearch_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReply_fieldAccessorTable + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_ResAccountSearch_fieldAccessorTable .ensureFieldAccessorsInitialized( - net.sopod.soim.logic.api.friend.search.UserSearchReply.class, net.sopod.soim.logic.api.friend.search.UserSearchReply.Builder.class); + net.sopod.soim.logic.api.friend.search.ResAccountSearch.class, net.sopod.soim.logic.api.friend.search.ResAccountSearch.Builder.class); } - public static final int USERS_FIELD_NUMBER = 1; - private java.util.List users_; + public static final int ACCOUNTS_FIELD_NUMBER = 1; + private java.util.List accounts_; /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ @java.lang.Override - public java.util.List getUsersList() { - return users_; + public java.util.List getAccountsList() { + return accounts_; } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ @java.lang.Override - public java.util.List - getUsersOrBuilderList() { - return users_; + public java.util.List + getAccountsOrBuilderList() { + return accounts_; } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ @java.lang.Override - public int getUsersCount() { - return users_.size(); + public int getAccountsCount() { + return accounts_.size(); } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserInfo getUsers(int index) { - return users_.get(index); + public net.sopod.soim.logic.api.friend.search.AccountInfo getAccounts(int index) { + return accounts_.get(index); } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserInfoOrBuilder getUsersOrBuilder( + public net.sopod.soim.logic.api.friend.search.AccountInfoOrBuilder getAccountsOrBuilder( int index) { - return users_.get(index); + return accounts_.get(index); } private byte memoizedIsInitialized = -1; @@ -148,8 +148,8 @@ private static final long serialVersionUID = 0L; @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < users_.size(); i++) { - output.writeMessage(1, users_.get(i)); + for (int i = 0; i < accounts_.size(); i++) { + output.writeMessage(1, accounts_.get(i)); } unknownFields.writeTo(output); } @@ -160,9 +160,9 @@ private static final long serialVersionUID = 0L; if (size != -1) return size; size = 0; - for (int i = 0; i < users_.size(); i++) { + for (int i = 0; i < accounts_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, users_.get(i)); + .computeMessageSize(1, accounts_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -174,13 +174,13 @@ private static final long serialVersionUID = 0L; if (obj == this) { return true; } - if (!(obj instanceof net.sopod.soim.logic.api.friend.search.UserSearchReply)) { + if (!(obj instanceof net.sopod.soim.logic.api.friend.search.ResAccountSearch)) { return super.equals(obj); } - net.sopod.soim.logic.api.friend.search.UserSearchReply other = (net.sopod.soim.logic.api.friend.search.UserSearchReply) obj; + net.sopod.soim.logic.api.friend.search.ResAccountSearch other = (net.sopod.soim.logic.api.friend.search.ResAccountSearch) obj; - if (!getUsersList() - .equals(other.getUsersList())) return false; + if (!getAccountsList() + .equals(other.getAccountsList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -192,78 +192,78 @@ private static final long serialVersionUID = 0L; } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getUsersCount() > 0) { - hash = (37 * hash) + USERS_FIELD_NUMBER; - hash = (53 * hash) + getUsersList().hashCode(); + if (getAccountsCount() > 0) { + hash = (37 * hash) + ACCOUNTS_FIELD_NUMBER; + hash = (53 * hash) + getAccountsList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; } - public static net.sopod.soim.logic.api.friend.search.UserSearchReply parseFrom( + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReply parseFrom( + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReply parseFrom( + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReply parseFrom( + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReply parseFrom(byte[] data) + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReply parseFrom( + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReply parseFrom(java.io.InputStream input) + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReply parseFrom( + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch 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 net.sopod.soim.logic.api.friend.search.UserSearchReply parseDelimitedFrom(java.io.InputStream input) + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReply parseDelimitedFrom( + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch 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 net.sopod.soim.logic.api.friend.search.UserSearchReply parseFrom( + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReply parseFrom( + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -276,7 +276,7 @@ private static final long serialVersionUID = 0L; public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(net.sopod.soim.logic.api.friend.search.UserSearchReply prototype) { + public static Builder newBuilder(net.sopod.soim.logic.api.friend.search.ResAccountSearch prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -292,26 +292,26 @@ private static final long serialVersionUID = 0L; return builder; } /** - * Protobuf type {@code net.sopod.soim.logic.api.friend.search.UserSearchReply} + * Protobuf type {@code net.sopod.soim.logic.api.friend.search.ResAccountSearch} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:net.sopod.soim.logic.api.friend.search.UserSearchReply) - net.sopod.soim.logic.api.friend.search.UserSearchReplyOrBuilder { + // @@protoc_insertion_point(builder_implements:net.sopod.soim.logic.api.friend.search.ResAccountSearch) + net.sopod.soim.logic.api.friend.search.ResAccountSearchOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReply_descriptor; + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_ResAccountSearch_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReply_fieldAccessorTable + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_ResAccountSearch_fieldAccessorTable .ensureFieldAccessorsInitialized( - net.sopod.soim.logic.api.friend.search.UserSearchReply.class, net.sopod.soim.logic.api.friend.search.UserSearchReply.Builder.class); + net.sopod.soim.logic.api.friend.search.ResAccountSearch.class, net.sopod.soim.logic.api.friend.search.ResAccountSearch.Builder.class); } - // Construct using net.sopod.soim.logic.api.friend.search.UserSearchReply.newBuilder() + // Construct using net.sopod.soim.logic.api.friend.search.ResAccountSearch.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -324,17 +324,17 @@ private static final long serialVersionUID = 0L; private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { - getUsersFieldBuilder(); + getAccountsFieldBuilder(); } } @java.lang.Override public Builder clear() { super.clear(); - if (usersBuilder_ == null) { - users_ = java.util.Collections.emptyList(); + if (accountsBuilder_ == null) { + accounts_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); } else { - usersBuilder_.clear(); + accountsBuilder_.clear(); } return this; } @@ -342,17 +342,17 @@ private static final long serialVersionUID = 0L; @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return net.sopod.soim.logic.api.friend.search.UserSearch.internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReply_descriptor; + return net.sopod.soim.logic.api.friend.search.AccountSearch.internal_static_net_sopod_soim_logic_api_friend_search_ResAccountSearch_descriptor; } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserSearchReply getDefaultInstanceForType() { - return net.sopod.soim.logic.api.friend.search.UserSearchReply.getDefaultInstance(); + public net.sopod.soim.logic.api.friend.search.ResAccountSearch getDefaultInstanceForType() { + return net.sopod.soim.logic.api.friend.search.ResAccountSearch.getDefaultInstance(); } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserSearchReply build() { - net.sopod.soim.logic.api.friend.search.UserSearchReply result = buildPartial(); + public net.sopod.soim.logic.api.friend.search.ResAccountSearch build() { + net.sopod.soim.logic.api.friend.search.ResAccountSearch result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -360,17 +360,17 @@ private static final long serialVersionUID = 0L; } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserSearchReply buildPartial() { - net.sopod.soim.logic.api.friend.search.UserSearchReply result = new net.sopod.soim.logic.api.friend.search.UserSearchReply(this); + public net.sopod.soim.logic.api.friend.search.ResAccountSearch buildPartial() { + net.sopod.soim.logic.api.friend.search.ResAccountSearch result = new net.sopod.soim.logic.api.friend.search.ResAccountSearch(this); int from_bitField0_ = bitField0_; - if (usersBuilder_ == null) { + if (accountsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { - users_ = java.util.Collections.unmodifiableList(users_); + accounts_ = java.util.Collections.unmodifiableList(accounts_); bitField0_ = (bitField0_ & ~0x00000001); } - result.users_ = users_; + result.accounts_ = accounts_; } else { - result.users_ = usersBuilder_.build(); + result.accounts_ = accountsBuilder_.build(); } onBuilt(); return result; @@ -410,39 +410,39 @@ private static final long serialVersionUID = 0L; } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof net.sopod.soim.logic.api.friend.search.UserSearchReply) { - return mergeFrom((net.sopod.soim.logic.api.friend.search.UserSearchReply)other); + if (other instanceof net.sopod.soim.logic.api.friend.search.ResAccountSearch) { + return mergeFrom((net.sopod.soim.logic.api.friend.search.ResAccountSearch)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(net.sopod.soim.logic.api.friend.search.UserSearchReply other) { - if (other == net.sopod.soim.logic.api.friend.search.UserSearchReply.getDefaultInstance()) return this; - if (usersBuilder_ == null) { - if (!other.users_.isEmpty()) { - if (users_.isEmpty()) { - users_ = other.users_; + public Builder mergeFrom(net.sopod.soim.logic.api.friend.search.ResAccountSearch other) { + if (other == net.sopod.soim.logic.api.friend.search.ResAccountSearch.getDefaultInstance()) return this; + if (accountsBuilder_ == null) { + if (!other.accounts_.isEmpty()) { + if (accounts_.isEmpty()) { + accounts_ = other.accounts_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureUsersIsMutable(); - users_.addAll(other.users_); + ensureAccountsIsMutable(); + accounts_.addAll(other.accounts_); } onChanged(); } } else { - if (!other.users_.isEmpty()) { - if (usersBuilder_.isEmpty()) { - usersBuilder_.dispose(); - usersBuilder_ = null; - users_ = other.users_; + if (!other.accounts_.isEmpty()) { + if (accountsBuilder_.isEmpty()) { + accountsBuilder_.dispose(); + accountsBuilder_ = null; + accounts_ = other.accounts_; bitField0_ = (bitField0_ & ~0x00000001); - usersBuilder_ = + accountsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getUsersFieldBuilder() : null; + getAccountsFieldBuilder() : null; } else { - usersBuilder_.addAllMessages(other.users_); + accountsBuilder_.addAllMessages(other.accounts_); } } } @@ -461,11 +461,11 @@ private static final long serialVersionUID = 0L; com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - net.sopod.soim.logic.api.friend.search.UserSearchReply parsedMessage = null; + net.sopod.soim.logic.api.friend.search.ResAccountSearch parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (net.sopod.soim.logic.api.friend.search.UserSearchReply) e.getUnfinishedMessage(); + parsedMessage = (net.sopod.soim.logic.api.friend.search.ResAccountSearch) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -476,244 +476,244 @@ private static final long serialVersionUID = 0L; } private int bitField0_; - private java.util.List users_ = + private java.util.List accounts_ = java.util.Collections.emptyList(); - private void ensureUsersIsMutable() { + private void ensureAccountsIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - users_ = new java.util.ArrayList(users_); + accounts_ = new java.util.ArrayList(accounts_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - net.sopod.soim.logic.api.friend.search.UserInfo, net.sopod.soim.logic.api.friend.search.UserInfo.Builder, net.sopod.soim.logic.api.friend.search.UserInfoOrBuilder> usersBuilder_; + net.sopod.soim.logic.api.friend.search.AccountInfo, net.sopod.soim.logic.api.friend.search.AccountInfo.Builder, net.sopod.soim.logic.api.friend.search.AccountInfoOrBuilder> accountsBuilder_; /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public java.util.List getUsersList() { - if (usersBuilder_ == null) { - return java.util.Collections.unmodifiableList(users_); + public java.util.List getAccountsList() { + if (accountsBuilder_ == null) { + return java.util.Collections.unmodifiableList(accounts_); } else { - return usersBuilder_.getMessageList(); + return accountsBuilder_.getMessageList(); } } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public int getUsersCount() { - if (usersBuilder_ == null) { - return users_.size(); + public int getAccountsCount() { + if (accountsBuilder_ == null) { + return accounts_.size(); } else { - return usersBuilder_.getCount(); + return accountsBuilder_.getCount(); } } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public net.sopod.soim.logic.api.friend.search.UserInfo getUsers(int index) { - if (usersBuilder_ == null) { - return users_.get(index); + public net.sopod.soim.logic.api.friend.search.AccountInfo getAccounts(int index) { + if (accountsBuilder_ == null) { + return accounts_.get(index); } else { - return usersBuilder_.getMessage(index); + return accountsBuilder_.getMessage(index); } } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public Builder setUsers( - int index, net.sopod.soim.logic.api.friend.search.UserInfo value) { - if (usersBuilder_ == null) { + public Builder setAccounts( + int index, net.sopod.soim.logic.api.friend.search.AccountInfo value) { + if (accountsBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureUsersIsMutable(); - users_.set(index, value); + ensureAccountsIsMutable(); + accounts_.set(index, value); onChanged(); } else { - usersBuilder_.setMessage(index, value); + accountsBuilder_.setMessage(index, value); } return this; } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public Builder setUsers( - int index, net.sopod.soim.logic.api.friend.search.UserInfo.Builder builderForValue) { - if (usersBuilder_ == null) { - ensureUsersIsMutable(); - users_.set(index, builderForValue.build()); + public Builder setAccounts( + int index, net.sopod.soim.logic.api.friend.search.AccountInfo.Builder builderForValue) { + if (accountsBuilder_ == null) { + ensureAccountsIsMutable(); + accounts_.set(index, builderForValue.build()); onChanged(); } else { - usersBuilder_.setMessage(index, builderForValue.build()); + accountsBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public Builder addUsers(net.sopod.soim.logic.api.friend.search.UserInfo value) { - if (usersBuilder_ == null) { + public Builder addAccounts(net.sopod.soim.logic.api.friend.search.AccountInfo value) { + if (accountsBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureUsersIsMutable(); - users_.add(value); + ensureAccountsIsMutable(); + accounts_.add(value); onChanged(); } else { - usersBuilder_.addMessage(value); + accountsBuilder_.addMessage(value); } return this; } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public Builder addUsers( - int index, net.sopod.soim.logic.api.friend.search.UserInfo value) { - if (usersBuilder_ == null) { + public Builder addAccounts( + int index, net.sopod.soim.logic.api.friend.search.AccountInfo value) { + if (accountsBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureUsersIsMutable(); - users_.add(index, value); + ensureAccountsIsMutable(); + accounts_.add(index, value); onChanged(); } else { - usersBuilder_.addMessage(index, value); + accountsBuilder_.addMessage(index, value); } return this; } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public Builder addUsers( - net.sopod.soim.logic.api.friend.search.UserInfo.Builder builderForValue) { - if (usersBuilder_ == null) { - ensureUsersIsMutable(); - users_.add(builderForValue.build()); + public Builder addAccounts( + net.sopod.soim.logic.api.friend.search.AccountInfo.Builder builderForValue) { + if (accountsBuilder_ == null) { + ensureAccountsIsMutable(); + accounts_.add(builderForValue.build()); onChanged(); } else { - usersBuilder_.addMessage(builderForValue.build()); + accountsBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public Builder addUsers( - int index, net.sopod.soim.logic.api.friend.search.UserInfo.Builder builderForValue) { - if (usersBuilder_ == null) { - ensureUsersIsMutable(); - users_.add(index, builderForValue.build()); + public Builder addAccounts( + int index, net.sopod.soim.logic.api.friend.search.AccountInfo.Builder builderForValue) { + if (accountsBuilder_ == null) { + ensureAccountsIsMutable(); + accounts_.add(index, builderForValue.build()); onChanged(); } else { - usersBuilder_.addMessage(index, builderForValue.build()); + accountsBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public Builder addAllUsers( - java.lang.Iterable values) { - if (usersBuilder_ == null) { - ensureUsersIsMutable(); + public Builder addAllAccounts( + java.lang.Iterable values) { + if (accountsBuilder_ == null) { + ensureAccountsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, users_); + values, accounts_); onChanged(); } else { - usersBuilder_.addAllMessages(values); + accountsBuilder_.addAllMessages(values); } return this; } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public Builder clearUsers() { - if (usersBuilder_ == null) { - users_ = java.util.Collections.emptyList(); + public Builder clearAccounts() { + if (accountsBuilder_ == null) { + accounts_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - usersBuilder_.clear(); + accountsBuilder_.clear(); } return this; } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public Builder removeUsers(int index) { - if (usersBuilder_ == null) { - ensureUsersIsMutable(); - users_.remove(index); + public Builder removeAccounts(int index) { + if (accountsBuilder_ == null) { + ensureAccountsIsMutable(); + accounts_.remove(index); onChanged(); } else { - usersBuilder_.remove(index); + accountsBuilder_.remove(index); } return this; } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public net.sopod.soim.logic.api.friend.search.UserInfo.Builder getUsersBuilder( + public net.sopod.soim.logic.api.friend.search.AccountInfo.Builder getAccountsBuilder( int index) { - return getUsersFieldBuilder().getBuilder(index); + return getAccountsFieldBuilder().getBuilder(index); } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public net.sopod.soim.logic.api.friend.search.UserInfoOrBuilder getUsersOrBuilder( + public net.sopod.soim.logic.api.friend.search.AccountInfoOrBuilder getAccountsOrBuilder( int index) { - if (usersBuilder_ == null) { - return users_.get(index); } else { - return usersBuilder_.getMessageOrBuilder(index); + if (accountsBuilder_ == null) { + return accounts_.get(index); } else { + return accountsBuilder_.getMessageOrBuilder(index); } } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public java.util.List - getUsersOrBuilderList() { - if (usersBuilder_ != null) { - return usersBuilder_.getMessageOrBuilderList(); + public java.util.List + getAccountsOrBuilderList() { + if (accountsBuilder_ != null) { + return accountsBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(users_); + return java.util.Collections.unmodifiableList(accounts_); } } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public net.sopod.soim.logic.api.friend.search.UserInfo.Builder addUsersBuilder() { - return getUsersFieldBuilder().addBuilder( - net.sopod.soim.logic.api.friend.search.UserInfo.getDefaultInstance()); + public net.sopod.soim.logic.api.friend.search.AccountInfo.Builder addAccountsBuilder() { + return getAccountsFieldBuilder().addBuilder( + net.sopod.soim.logic.api.friend.search.AccountInfo.getDefaultInstance()); } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public net.sopod.soim.logic.api.friend.search.UserInfo.Builder addUsersBuilder( + public net.sopod.soim.logic.api.friend.search.AccountInfo.Builder addAccountsBuilder( int index) { - return getUsersFieldBuilder().addBuilder( - index, net.sopod.soim.logic.api.friend.search.UserInfo.getDefaultInstance()); + return getAccountsFieldBuilder().addBuilder( + index, net.sopod.soim.logic.api.friend.search.AccountInfo.getDefaultInstance()); } /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; */ - public java.util.List - getUsersBuilderList() { - return getUsersFieldBuilder().getBuilderList(); + public java.util.List + getAccountsBuilderList() { + return getAccountsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - net.sopod.soim.logic.api.friend.search.UserInfo, net.sopod.soim.logic.api.friend.search.UserInfo.Builder, net.sopod.soim.logic.api.friend.search.UserInfoOrBuilder> - getUsersFieldBuilder() { - if (usersBuilder_ == null) { - usersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - net.sopod.soim.logic.api.friend.search.UserInfo, net.sopod.soim.logic.api.friend.search.UserInfo.Builder, net.sopod.soim.logic.api.friend.search.UserInfoOrBuilder>( - users_, + net.sopod.soim.logic.api.friend.search.AccountInfo, net.sopod.soim.logic.api.friend.search.AccountInfo.Builder, net.sopod.soim.logic.api.friend.search.AccountInfoOrBuilder> + getAccountsFieldBuilder() { + if (accountsBuilder_ == null) { + accountsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + net.sopod.soim.logic.api.friend.search.AccountInfo, net.sopod.soim.logic.api.friend.search.AccountInfo.Builder, net.sopod.soim.logic.api.friend.search.AccountInfoOrBuilder>( + accounts_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); - users_ = null; + accounts_ = null; } - return usersBuilder_; + return accountsBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -728,41 +728,41 @@ private static final long serialVersionUID = 0L; } - // @@protoc_insertion_point(builder_scope:net.sopod.soim.logic.api.friend.search.UserSearchReply) + // @@protoc_insertion_point(builder_scope:net.sopod.soim.logic.api.friend.search.ResAccountSearch) } - // @@protoc_insertion_point(class_scope:net.sopod.soim.logic.api.friend.search.UserSearchReply) - private static final net.sopod.soim.logic.api.friend.search.UserSearchReply DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:net.sopod.soim.logic.api.friend.search.ResAccountSearch) + private static final net.sopod.soim.logic.api.friend.search.ResAccountSearch DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new net.sopod.soim.logic.api.friend.search.UserSearchReply(); + DEFAULT_INSTANCE = new net.sopod.soim.logic.api.friend.search.ResAccountSearch(); } - public static net.sopod.soim.logic.api.friend.search.UserSearchReply getDefaultInstance() { + public static net.sopod.soim.logic.api.friend.search.ResAccountSearch getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public UserSearchReply parsePartialFrom( + public ResAccountSearch parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new UserSearchReply(input, extensionRegistry); + return new ResAccountSearch(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public net.sopod.soim.logic.api.friend.search.UserSearchReply getDefaultInstanceForType() { + public net.sopod.soim.logic.api.friend.search.ResAccountSearch getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ResAccountSearchOrBuilder.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ResAccountSearchOrBuilder.java new file mode 100644 index 0000000..13709f3 --- /dev/null +++ b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/ResAccountSearchOrBuilder.java @@ -0,0 +1,33 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto/AccountSearch.proto + +package net.sopod.soim.logic.api.friend.search; + +public interface ResAccountSearchOrBuilder extends + // @@protoc_insertion_point(interface_extends:net.sopod.soim.logic.api.friend.search.ResAccountSearch) + com.google.protobuf.MessageOrBuilder { + + /** + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; + */ + java.util.List + getAccountsList(); + /** + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; + */ + net.sopod.soim.logic.api.friend.search.AccountInfo getAccounts(int index); + /** + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; + */ + int getAccountsCount(); + /** + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; + */ + java.util.List + getAccountsOrBuilderList(); + /** + * repeated .net.sopod.soim.logic.api.friend.search.AccountInfo accounts = 1; + */ + net.sopod.soim.logic.api.friend.search.AccountInfoOrBuilder getAccountsOrBuilder( + int index); +} diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearch.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearch.java deleted file mode 100644 index 6850c42..0000000 --- a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearch.java +++ /dev/null @@ -1,78 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto/UserSearch.proto - -package net.sopod.soim.logic.api.friend.search; - -public final class UserSearch { - private UserSearch() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistryLite registry) { - } - - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions( - (com.google.protobuf.ExtensionRegistryLite) registry); - } - static final com.google.protobuf.Descriptors.Descriptor - internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReq_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReq_fieldAccessorTable; - static final com.google.protobuf.Descriptors.Descriptor - internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReply_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReply_fieldAccessorTable; - static final com.google.protobuf.Descriptors.Descriptor - internal_static_net_sopod_soim_logic_api_friend_search_UserInfo_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_net_sopod_soim_logic_api_friend_search_UserInfo_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\026proto/UserSearch.proto\022&net.sopod.soim" + - ".logic.api.friend.search\" \n\rUserSearchRe" + - "q\022\017\n\007keyword\030\001 \001(\t\"R\n\017UserSearchReply\022?\n" + - "\005users\030\001 \003(\01320.net.sopod.soim.logic.api." + - "friend.search.UserInfo\":\n\010UserInfo\022\013\n\003ui" + - "d\030\001 \001(\003\022\017\n\007account\030\002 \001(\t\022\020\n\010nickname\030\003 \001" + - "(\t2\223\001\n\021UserSearchService\022~\n\nsearchUser\0225" + - ".net.sopod.soim.logic.api.friend.search." + - "UserSearchReq\0327.net.sopod.soim.logic.api" + - ".friend.search.UserSearchReply\"\000B\002P\001b\006pr" + - "oto3" - }; - descriptor = com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }); - internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReq_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReq_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReq_descriptor, - new java.lang.String[] { "Keyword", }); - internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReply_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReply_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_net_sopod_soim_logic_api_friend_search_UserSearchReply_descriptor, - new java.lang.String[] { "Users", }); - internal_static_net_sopod_soim_logic_api_friend_search_UserInfo_descriptor = - getDescriptor().getMessageTypes().get(2); - internal_static_net_sopod_soim_logic_api_friend_search_UserInfo_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_net_sopod_soim_logic_api_friend_search_UserInfo_descriptor, - new java.lang.String[] { "Uid", "Account", "Nickname", }); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReplyOrBuilder.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReplyOrBuilder.java deleted file mode 100644 index 620b2c5..0000000 --- a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchReplyOrBuilder.java +++ /dev/null @@ -1,33 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto/UserSearch.proto - -package net.sopod.soim.logic.api.friend.search; - -public interface UserSearchReplyOrBuilder extends - // @@protoc_insertion_point(interface_extends:net.sopod.soim.logic.api.friend.search.UserSearchReply) - com.google.protobuf.MessageOrBuilder { - - /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; - */ - java.util.List - getUsersList(); - /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; - */ - net.sopod.soim.logic.api.friend.search.UserInfo getUsers(int index); - /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; - */ - int getUsersCount(); - /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; - */ - java.util.List - getUsersOrBuilderList(); - /** - * repeated .net.sopod.soim.logic.api.friend.search.UserInfo users = 1; - */ - net.sopod.soim.logic.api.friend.search.UserInfoOrBuilder getUsersOrBuilder( - int index); -} diff --git a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchService.java b/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchService.java deleted file mode 100644 index 64186fa..0000000 --- a/im-service-api/im-logic-friend-api/src/main/java/net/sopod/soim/logic/api/friend/search/UserSearchService.java +++ /dev/null @@ -1,21 +0,0 @@ - package net.sopod.soim.logic.api.friend.search; - -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.atomic.AtomicBoolean; - -@javax.annotation.Generated( -value = "by Dubbo generator", -comments = "Source: proto/UserSearch.proto") -public interface UserSearchService { -static final String JAVA_SERVICE_NAME = "net.sopod.soim.logic.api.friend.search.UserSearchService"; -static final String SERVICE_NAME = "net.sopod.soim.logic.api.friend.search.UserSearchService"; - - // FIXME, initialize Dubbo3 stub when interface loaded, thinking of new ways doing this. - static final boolean inited = UserSearchServiceDubbo.init(); - - net.sopod.soim.logic.api.friend.search.UserSearchReply searchUser(net.sopod.soim.logic.api.friend.search.UserSearchReq request); - - CompletableFuture searchUserAsync(net.sopod.soim.logic.api.friend.search.UserSearchReq request); - - -} diff --git a/im-service-api/im-logic-friend-api/src/main/resources/proto/AccountSearch.proto b/im-service-api/im-logic-friend-api/src/main/resources/proto/AccountSearch.proto new file mode 100644 index 0000000..d7ae2f5 --- /dev/null +++ b/im-service-api/im-logic-friend-api/src/main/resources/proto/AccountSearch.proto @@ -0,0 +1,26 @@ +syntax = "proto3"; + +option java_multiple_files = true; + +package net.sopod.soim.logic.api.friend.search; + +service AccountSearchService { + + // 关键字搜索用户 + rpc searchAccountLikely(ReqAccountSearch) returns (ResAccountSearch) {} + +} + +message ReqAccountSearch { + string keyword = 1; +} + +message ResAccountSearch { + repeated AccountInfo accounts = 1; +} + +message AccountInfo { + int64 uid = 1; + string account = 2; + string nickname = 3; +} diff --git a/im-service-api/im-logic-friend-api/src/main/resources/proto/UserSearch.proto b/im-service-api/im-logic-friend-api/src/main/resources/proto/UserSearch.proto deleted file mode 100644 index 2026d66..0000000 --- a/im-service-api/im-logic-friend-api/src/main/resources/proto/UserSearch.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - -option java_multiple_files = true; - -package net.sopod.soim.logic.api.friend.search; - - -service UserSearchService { - - // 关键字搜索用户 - rpc searchUser(UserSearchReq) returns (UserSearchReply) {} - -} diff --git a/im-service-api/im-router-api/src/main/java/net/sopod/soim/router/api/service/storage/RouterStorage.java b/im-service-api/im-router-api/src/main/java/net/sopod/soim/router/api/service/storage/RouterStorage.java new file mode 100644 index 0000000..3d36667 --- /dev/null +++ b/im-service-api/im-router-api/src/main/java/net/sopod/soim/router/api/service/storage/RouterStorage.java @@ -0,0 +1,37 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto/RouterStorage.proto + +package net.sopod.soim.router.api.service.storage; + +public final class RouterStorage { + private RouterStorage() {} + 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 static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\031proto/RouterStorage.proto\022)net.sopod.s" + + "oim.router.api.service.storage2\026\n\024Router" + + "StorageServiceB\002P\001b\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/im-service-api/im-router-api/src/main/java/net/sopod/soim/router/api/service/storage/RouterStorageService.java b/im-service-api/im-router-api/src/main/java/net/sopod/soim/router/api/service/storage/RouterStorageService.java new file mode 100644 index 0000000..108de15 --- /dev/null +++ b/im-service-api/im-router-api/src/main/java/net/sopod/soim/router/api/service/storage/RouterStorageService.java @@ -0,0 +1,17 @@ + package net.sopod.soim.router.api.service.storage; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicBoolean; + +@javax.annotation.Generated( +value = "by Dubbo generator", +comments = "Source: proto/RouterStorage.proto") +public interface RouterStorageService { +static final String JAVA_SERVICE_NAME = "net.sopod.soim.router.api.service.storage.RouterStorageService"; +static final String SERVICE_NAME = "net.sopod.soim.router.api.service.storage.RouterStorageService"; + + // FIXME, initialize Dubbo3 stub when interface loaded, thinking of new ways doing this. + static final boolean inited = RouterStorageServiceDubbo.init(); + + +} diff --git a/im-service-api/im-router-api/src/main/java/net/sopod/soim/router/api/service/storage/RouterStorageServiceDubbo.java b/im-service-api/im-router-api/src/main/java/net/sopod/soim/router/api/service/storage/RouterStorageServiceDubbo.java new file mode 100644 index 0000000..2b3fc08 --- /dev/null +++ b/im-service-api/im-router-api/src/main/java/net/sopod/soim/router/api/service/storage/RouterStorageServiceDubbo.java @@ -0,0 +1,20 @@ + package net.sopod.soim.router.api.service.storage; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicBoolean; + +@javax.annotation.Generated( +value = "by Dubbo generator", +comments = "Source: proto/RouterStorage.proto") +public final class RouterStorageServiceDubbo { +private static final AtomicBoolean registered = new AtomicBoolean(); + +public static boolean init() { + if (registered.compareAndSet(false, true)) { + } + return true; +} + +private RouterStorageServiceDubbo() {} + +} diff --git a/im-service/im-logic-friend/src/main/java/net/sopod/soim/logic/friend/service/UserSearchServiceImpl.java b/im-service/im-logic-friend/src/main/java/net/sopod/soim/logic/friend/service/UserSearchServiceImpl.java index fe154c2..7c80d15 100644 --- a/im-service/im-logic-friend/src/main/java/net/sopod/soim/logic/friend/service/UserSearchServiceImpl.java +++ b/im-service/im-logic-friend/src/main/java/net/sopod/soim/logic/friend/service/UserSearchServiceImpl.java @@ -2,13 +2,16 @@ package net.sopod.soim.logic.friend.service; import net.sopod.soim.das.user.api.model.entity.ImUser; import net.sopod.soim.das.user.api.service.UserDas; -import net.sopod.soim.logic.api.friend.search.UserSearchReply; -import net.sopod.soim.logic.api.friend.search.UserSearchReq; -import net.sopod.soim.logic.api.friend.search.UserSearchService; +import net.sopod.soim.logic.api.friend.search.AccountInfo; +import net.sopod.soim.logic.api.friend.search.AccountSearchService; +import net.sopod.soim.logic.api.friend.search.ReqAccountSearch; +import net.sopod.soim.logic.api.friend.search.ResAccountSearch; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; +import java.util.List; import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; /** * UserSearchServiceImpl @@ -17,22 +20,30 @@ import java.util.concurrent.CompletableFuture; * @date 2022-05-15 22:43 */ @DubboService -public class UserSearchServiceImpl implements UserSearchService { +public class UserSearchServiceImpl implements AccountSearchService { @DubboReference private UserDas userDas; @Override - public UserSearchReply searchUser(UserSearchReq request) { + public ResAccountSearch searchAccountLikely(ReqAccountSearch request) { // 查询在线用户列表 - - - return null; + List imUsers = userDas.searchImUser(request.getKeyword(), 10); + List userInfos = imUsers.stream().map( + imUser -> AccountInfo.newBuilder(). + setAccount(imUser.getAccount()) + .setNickname(imUser.getNickname()) + .setUid(imUser.getId()).build() + ).collect(Collectors.toList()); + + return ResAccountSearch.newBuilder() + .addAllAccounts(userInfos) + .build(); } @Override - public CompletableFuture searchUserAsync(UserSearchReq request) { - return CompletableFuture.completedFuture(searchUser(request)); + public CompletableFuture searchAccountLikelyAsync(ReqAccountSearch request) { + return CompletableFuture.completedFuture(searchAccountLikely(request)); } }