This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.22 by this push:
new 8936e4c5350 api:rename RegisterCmd.java => RegisterUserKeyCmd.java
(#12259)
8936e4c5350 is described below
commit 8936e4c53507b4cdb0c656a7689db863535ced00
Author: Wei Zhou <[email protected]>
AuthorDate: Thu Dec 18 11:53:00 2025 +0100
api:rename RegisterCmd.java => RegisterUserKeyCmd.java (#12259)
---
api/src/main/java/com/cloud/user/AccountService.java | 4 ++--
.../apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java | 6 +++---
.../admin/user/{RegisterCmd.java => RegisterUserKeyCmd.java} | 8 ++++----
.../{RegisterResponse.java => RegisterUserKeyResponse.java} | 2 +-
.../network/contrail/management/MockAccountManager.java | 4 ++--
server/src/main/java/com/cloud/server/ManagementServerImpl.java | 4 ++--
server/src/main/java/com/cloud/user/AccountManagerImpl.java | 4 ++--
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/api/src/main/java/com/cloud/user/AccountService.java
b/api/src/main/java/com/cloud/user/AccountService.java
index c0ebcf09f59..09fe5ffc059 100644
--- a/api/src/main/java/com/cloud/user/AccountService.java
+++ b/api/src/main/java/com/cloud/user/AccountService.java
@@ -25,7 +25,7 @@ import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.command.admin.account.CreateAccountCmd;
import org.apache.cloudstack.api.command.admin.user.GetUserKeysCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterUserKeyCmd;
import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
import com.cloud.dc.DataCenter;
@@ -95,7 +95,7 @@ public interface AccountService {
void markUserRegistered(long userId);
- public String[] createApiKeyAndSecretKey(RegisterCmd cmd);
+ public String[] createApiKeyAndSecretKey(RegisterUserKeyCmd cmd);
public String[] createApiKeyAndSecretKey(final long userId);
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java
index cdd239f72b5..f04c5f6c478 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java
@@ -26,14 +26,14 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.RegisterResponse;
+import org.apache.cloudstack.api.response.RegisterUserKeyResponse;
import org.apache.cloudstack.api.response.UserResponse;
import java.util.Map;
@APICommand(name = "getUserKeys",
description = "This command allows the user to query the seceret
and API keys for the account",
- responseObject = RegisterResponse.class,
+ responseObject = RegisterUserKeyResponse.class,
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true,
authorized = {RoleType.User, RoleType.Admin, RoleType.DomainAdmin,
RoleType.ResourceAdmin},
@@ -57,7 +57,7 @@ public class GetUserKeysCmd extends BaseCmd{
public void execute(){
Pair<Boolean, Map<String, String>> keys =
_accountService.getKeys(this);
- RegisterResponse response = new RegisterResponse();
+ RegisterUserKeyResponse response = new RegisterUserKeyResponse();
if(keys != null){
response.setApiKeyAccess(keys.first());
response.setApiKey(keys.second().get("apikey"));
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeyCmd.java
similarity index 93%
rename from
api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
rename to
api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeyCmd.java
index b3e7d2bec82..61f47e2799c 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeyCmd.java
@@ -22,17 +22,17 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.RegisterResponse;
+import org.apache.cloudstack.api.response.RegisterUserKeyResponse;
import org.apache.cloudstack.api.response.UserResponse;
import com.cloud.user.Account;
import com.cloud.user.User;
@APICommand(name = "registerUserKeys",
- responseObject = RegisterResponse.class,
+ responseObject = RegisterUserKeyResponse.class,
description = "This command allows a user to register for the
developer API, returning a secret key and an API key. This request is made
through the integration API port, so it is a privileged command and must be
made on behalf of a user. It is up to the implementer just how the username and
password are entered, and then how that translates to an integration API
request. Both secret key and API key should be returned to the user",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class RegisterCmd extends BaseCmd {
+public class RegisterUserKeyCmd extends BaseCmd {
/////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public class RegisterCmd extends BaseCmd {
@Override
public void execute() {
String[] keys = _accountService.createApiKeyAndSecretKey(this);
- RegisterResponse response = new RegisterResponse();
+ RegisterUserKeyResponse response = new RegisterUserKeyResponse();
if (keys != null) {
response.setApiKey(keys[0]);
response.setSecretKey(keys[1]);
diff --git
a/api/src/main/java/org/apache/cloudstack/api/response/RegisterResponse.java
b/api/src/main/java/org/apache/cloudstack/api/response/RegisterUserKeyResponse.java
similarity index 96%
rename from
api/src/main/java/org/apache/cloudstack/api/response/RegisterResponse.java
rename to
api/src/main/java/org/apache/cloudstack/api/response/RegisterUserKeyResponse.java
index dd17cc5cc8a..c767fb1e673 100644
--- a/api/src/main/java/org/apache/cloudstack/api/response/RegisterResponse.java
+++
b/api/src/main/java/org/apache/cloudstack/api/response/RegisterUserKeyResponse.java
@@ -23,7 +23,7 @@ import org.apache.cloudstack.api.BaseResponse;
import com.cloud.serializer.Param;
-public class RegisterResponse extends BaseResponse {
+public class RegisterUserKeyResponse extends BaseResponse {
@SerializedName(ApiConstants.API_KEY)
@Param(description = "the api key of the registered user", isSensitive =
true)
private String apiKey;
diff --git
a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index bc9dbfa7b43..2ff68b4836f 100644
---
a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++
b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@ -37,7 +37,7 @@ import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;
import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterUserKeyCmd;
import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
import org.apache.cloudstack.context.CallContext;
@@ -118,7 +118,7 @@ public class MockAccountManager extends ManagerBase
implements AccountManager {
}
@Override
- public String[] createApiKeyAndSecretKey(RegisterCmd arg0) {
+ public String[] createApiKeyAndSecretKey(RegisterUserKeyCmd arg0) {
// TODO Auto-generated method stub
return null;
}
diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
index 1a3f18011be..8eb277c7b61 100644
--- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java
@@ -282,7 +282,7 @@ import
org.apache.cloudstack.api.command.admin.user.GetUserKeysCmd;
import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
import org.apache.cloudstack.api.command.admin.user.LockUserCmd;
import org.apache.cloudstack.api.command.admin.user.MoveUserCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterUserKeyCmd;
import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd;
import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd;
@@ -3931,7 +3931,7 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
cmdList.add(ListUsersCmd.class);
cmdList.add(LockUserCmd.class);
cmdList.add(MoveUserCmd.class);
- cmdList.add(RegisterCmd.class);
+ cmdList.add(RegisterUserKeyCmd.class);
cmdList.add(UpdateUserCmd.class);
cmdList.add(CreateVlanIpRangeCmd.class);
cmdList.add(UpdateVlanIpRangeCmd.class);
diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java
b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
index 80387c2fc12..b0ba97d6de4 100644
--- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
@@ -61,7 +61,7 @@ import
org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;
import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
import org.apache.cloudstack.api.command.admin.user.GetUserKeysCmd;
import org.apache.cloudstack.api.command.admin.user.MoveUserCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterUserKeyCmd;
import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
import
org.apache.cloudstack.api.response.UserTwoFactorAuthenticationSetupResponse;
import org.apache.cloudstack.auth.UserAuthenticator;
@@ -3129,7 +3129,7 @@ public class AccountManagerImpl extends ManagerBase
implements AccountManager, M
@Override
@DB
@ActionEvent(eventType = EventTypes.EVENT_REGISTER_FOR_SECRET_API_KEY,
eventDescription = "register for the developer API keys")
- public String[] createApiKeyAndSecretKey(RegisterCmd cmd) {
+ public String[] createApiKeyAndSecretKey(RegisterUserKeyCmd cmd) {
Account caller = getCurrentCallingAccount();
final Long userId = cmd.getId();
