Revert attempt to builder-ify accountModel

persistence-room/src/main/java/org/mercury_im/messenger/persistence/room/model/RoomAccountModel.java

@@ -49,9 +49,8 @@ public class RoomAccountModel extends AbstractAccountModel {
     }
 
     @Override
-    public RoomAccountModel setId(long id) {
+    public void setId(long id) {
         this.id = id;
-        return this;
     }
 
     @Override

persistence-room/src/main/java/org/mercury_im/messenger/persistence/room/repository/IAccountRepository.java

@@ -52,7 +52,10 @@ public class IAccountRepository implements AccountRepository<RoomAccountModel> {
     @Override
     public Single<Long> insertAccount(@NonNull RoomAccountModel accountModel) {
         return accountDao.insert(accountModel)
-                .map(accountId -> accountModel.setId(accountId).getId())
+                .map(accountId -> {
+                    accountModel.setId(accountId);
+                    return accountId;
+                })
                 .doOnSubscribe(ignore -> Log.v(TAG, "Insert " + accountModel))
                 .doAfterSuccess(accountId -> Log.v(TAG, "AccountModel has new ID " + accountId));
     }

persistence/src/main/java/org/mercury_im/messenger/persistence/model/AccountModel.java

@@ -19,7 +19,7 @@ public interface AccountModel {
      *
      * @param id account id
      */
-    AccountModel setId(long id);
+    void setId(long id);
 
     /**
      * Return the password of the XMPP account.