change Map value type from String to UUID

erikbocks · erikbocks · commit 0c39212b9b1d · 2026-01-26T16:53:15.000-03:00
diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
@@ -27,6 +27,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.regex.Pattern;
 
 import javax.inject.Inject;
@@ -500,10 +501,10 @@ public Map<String, String> convertExternalDetailsToMap(Map externalDetails) {
     }
 
     public String getResourceUuid(String parameterName) {
-        String resourceUuid = CallContext.current().getApiResourceUuid(parameterName);
+        UUID resourceUuid = CallContext.current().getApiResourceUuid(parameterName);
 
         if (resourceUuid != null) {
-            return resourceUuid;
+            return resourceUuid.toString();
         }
 
         return null;
diff --git a/api/src/main/java/org/apache/cloudstack/context/CallContext.java b/api/src/main/java/org/apache/cloudstack/context/CallContext.java
@@ -63,7 +63,7 @@ protected Stack<CallContext> initialValue() {
     private User user;
     private long userId;
     private final Map<Object, Object> context = new HashMap<Object, Object>();
-    private final Map<String, String> apiResourcesUuids = new HashMap<>();
+    private final Map<String, UUID> apiResourcesUuids = new HashMap<>();
     private Project project;
     private String apiName;
 
@@ -389,11 +389,11 @@ public void setEventDisplayEnabled(boolean eventDisplayEnabled) {
         isEventDisplayEnabled = eventDisplayEnabled;
     }
 
-    public String getApiResourceUuid(String paramName) {
+    public UUID getApiResourceUuid(String paramName) {
         return apiResourcesUuids.get(paramName);
     }
 
-    public void putApiResourceUuid(String paramName, String uuid) {
+    public void putApiResourceUuid(String paramName, UUID uuid) {
         apiResourcesUuids.put(paramName, uuid);
     }
 
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForGuestNetworkCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForGuestNetworkCmdTest.java
@@ -40,7 +40,7 @@ public class CreateIpv4SubnetForGuestNetworkCmdTest {
     @Test
     public void testCreateIpv4SubnetForGuestNetworkCmd() {
         Long parentId = 1L;
-        String  parentUuid = UUID.randomUUID().toString();
+        UUID parentUuid = UUID.randomUUID();
         String subnet = "192.168.1.0/24";
         Integer cidrSize = 26;
 
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForZoneCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForZoneCmdTest.java
@@ -40,7 +40,7 @@ public class CreateIpv4SubnetForZoneCmdTest {
     @Test
     public void testCreateIpv4SubnetForZoneCmd() {
         Long zoneId = 1L;
-        String zoneUuid = UUID.randomUUID().toString();
+        UUID zoneUuid = UUID.randomUUID();
         String subnet = "192.168.1.0/24";
         String accountName = "user";
         Long projectId = 10L;
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/DedicateIpv4SubnetForZoneCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/DedicateIpv4SubnetForZoneCmdTest.java
@@ -39,7 +39,7 @@ public class DedicateIpv4SubnetForZoneCmdTest {
     @Test
     public void testDedicateIpv4SubnetForZoneCmd() {
         Long id = 1L;
-        String uuid = UUID.randomUUID().toString();
+        UUID uuid = UUID.randomUUID();
         String accountName = "user";
         Long projectId = 10L;
         Long domainId = 11L;
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForGuestNetworkCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForGuestNetworkCmdTest.java
@@ -39,7 +39,7 @@ public class DeleteIpv4SubnetForGuestNetworkCmdTest {
     @Test
     public void testDeleteIpv4SubnetForGuestNetworkCmd() {
         Long id = 1L;
-        String uuid = UUID.randomUUID().toString();
+        UUID uuid = UUID.randomUUID();
 
         DeleteIpv4SubnetForGuestNetworkCmd cmd = new DeleteIpv4SubnetForGuestNetworkCmd();
         ReflectionTestUtils.setField(cmd, "id", id);
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForZoneCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForZoneCmdTest.java
@@ -39,7 +39,7 @@ public class DeleteIpv4SubnetForZoneCmdTest {
     @Test
     public void testDeleteIpv4SubnetForZoneCmd() {
         Long id = 1L;
-        String uuid = UUID.randomUUID().toString();
+        UUID uuid = UUID.randomUUID();
 
         DeleteIpv4SubnetForZoneCmd cmd = new DeleteIpv4SubnetForZoneCmd();
         ReflectionTestUtils.setField(cmd, "id", id);
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedIpv4SubnetForZoneCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedIpv4SubnetForZoneCmdTest.java
@@ -39,7 +39,7 @@ public class ReleaseDedicatedIpv4SubnetForZoneCmdTest {
     @Test
     public void testReleaseDedicatedIpv4SubnetForZoneCmd() {
         Long id = 1L;
-        String uuid = UUID.randomUUID().toString();
+        UUID uuid = UUID.randomUUID();
 
         ReleaseDedicatedIpv4SubnetForZoneCmd cmd = new ReleaseDedicatedIpv4SubnetForZoneCmd();
         ReflectionTestUtils.setField(cmd, "id", id);
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/UpdateIpv4SubnetForZoneCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/UpdateIpv4SubnetForZoneCmdTest.java
@@ -40,7 +40,7 @@ public class UpdateIpv4SubnetForZoneCmdTest {
     @Test
     public void testUpdateIpv4SubnetForZoneCmd() {
         Long id = 1L;
-        String uuid = UUID.randomUUID().toString();
+        UUID uuid = UUID.randomUUID();
         String subnet = "192.168.1.0/24";
 
         UpdateIpv4SubnetForZoneCmd cmd = new UpdateIpv4SubnetForZoneCmd();
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForNetworkCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForNetworkCmdTest.java
@@ -46,7 +46,7 @@ public class ChangeBgpPeersForNetworkCmdTest {
     @Test
     public void testChangeBgpPeersForNetworkCmd() {
         Long networkId = 10L;
-        String networkUuid = UUID.randomUUID().toString();
+        UUID networkUuid = UUID.randomUUID();
         List<Long> bgpPeerIds = Arrays.asList(20L, 21L);
 
         ChangeBgpPeersForNetworkCmd cmd = new ChangeBgpPeersForNetworkCmd();
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForVpcCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForVpcCmdTest.java
@@ -46,7 +46,7 @@ public class ChangeBgpPeersForVpcCmdTest {
     @Test
     public void testChangeBgpPeersForVpcCmd() {
         Long VpcId = 10L;
-        String vpcUuid = UUID.randomUUID().toString();
+        UUID vpcUuid = UUID.randomUUID();
         List<Long> bgpPeerIds = Arrays.asList(20L, 21L);
 
         ChangeBgpPeersForVpcCmd cmd = new ChangeBgpPeersForVpcCmd();
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/CreateBgpPeerCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/CreateBgpPeerCmdTest.java
@@ -40,7 +40,7 @@ public class CreateBgpPeerCmdTest {
     @Test
     public void testCreateBgpPeerCmd() {
         Long zoneId = 1L;
-        String zoneUuid = UUID.randomUUID().toString();
+        UUID zoneUuid = UUID.randomUUID();
         String accountName = "user";
         Long projectId = 10L;
         Long domainId = 11L;
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/DedicateBgpPeerCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/DedicateBgpPeerCmdTest.java
@@ -39,7 +39,7 @@ public class DedicateBgpPeerCmdTest {
     @Test
     public void testDedicateBgpPeerCmd() {
         Long id = 1L;
-        String uuid = UUID.randomUUID().toString();
+        UUID uuid = UUID.randomUUID();
         String accountName = "user";
         Long projectId = 10L;
         Long domainId = 11L;
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/DeleteBgpPeerCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/DeleteBgpPeerCmdTest.java
@@ -39,7 +39,7 @@ public class DeleteBgpPeerCmdTest {
     @Test
     public void testDeleteBgpPeerCmd() {
         Long id = 1L;
-        String uuid = UUID.randomUUID().toString();
+        UUID uuid = UUID.randomUUID();
 
         DeleteBgpPeerCmd cmd = new DeleteBgpPeerCmd();
         ReflectionTestUtils.setField(cmd, "id", id);
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ReleaseDedicatedBgpPeerCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ReleaseDedicatedBgpPeerCmdTest.java
@@ -39,7 +39,7 @@ public class ReleaseDedicatedBgpPeerCmdTest {
     @Test
     public void testReleaseDedicatedBgpPeerCmd() {
         Long id = 1L;
-        String uuid = UUID.randomUUID().toString();
+        UUID uuid = UUID.randomUUID();
 
         ReleaseDedicatedBgpPeerCmd cmd = new ReleaseDedicatedBgpPeerCmd();
         ReflectionTestUtils.setField(cmd, "id", id);
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/UpdateBgpPeerCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/UpdateBgpPeerCmdTest.java
@@ -40,7 +40,7 @@ public class UpdateBgpPeerCmdTest {
     @Test
     public void testUpdateBgpPeerCmd() {
         Long id = 1L;
-        String uuid = UUID.randomUUID().toString();
+        UUID uuid = UUID.randomUUID();
         String ip4Address = "ip4-address";
         String ip6Address = "ip6-address";
         Long peerAsNumber = 15000L;
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/DownloadImageStoreObjectCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/storage/DownloadImageStoreObjectCmdTest.java
@@ -97,7 +97,7 @@ public void testGetEventType() {
 
     @Test
     public void testGetEventDescription() {
-        String uuid = UUID.randomUUID().toString();
+        UUID uuid = UUID.randomUUID();
 
         ReflectionTestUtils.setField(cmd, "storeId", 1L);
         ReflectionTestUtils.setField(cmd, "path", "path/to/object");
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/admin/volume/UnmanageVolumeCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/admin/volume/UnmanageVolumeCmdTest.java
@@ -44,7 +44,7 @@ public class UnmanageVolumeCmdTest {
     public void testUnmanageVolumeCmd() {
         long accountId = 2L;
         Long volumeId = 3L;
-        String volumeUuid = UUID.randomUUID().toString();
+        UUID volumeUuid = UUID.randomUUID();
         Volume volume = Mockito.mock(Volume.class);
 
         Mockito.when(responseGenerator.findVolumeById(volumeId)).thenReturn(volume);
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/CreateSnapshotCmdTest.java
@@ -118,7 +118,7 @@ public void testCreateFailure() {
         AccountService accountService = Mockito.mock(AccountService.class);
         Account account = Mockito.mock(Account.class);
         Mockito.when(accountService.getAccount(anyLong())).thenReturn(account);
-        String  volumeUuid = UUID.randomUUID().toString();
+        UUID volumeUuid = UUID.randomUUID();
 
         CallContext.current().putApiResourceUuid("volumeid", volumeUuid);
 
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateConditionCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateConditionCmdTest.java
@@ -56,7 +56,7 @@ public class UpdateConditionCmdTest {
     private static final Long threshold = 100L;
 
     private static final long accountId = 5L;
-    private static final String conditionUuid = UUID.randomUUID().toString();
+    private static final UUID conditionUuid = UUID.randomUUID();
 
     @Before
     public void setUp() {
diff --git a/api/src/test/java/org/apache/cloudstack/api/command/user/network/routing/DeleteRoutingFirewallRuleCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/user/network/routing/DeleteRoutingFirewallRuleCmdTest.java
@@ -49,7 +49,7 @@ public void testProperties() {
         ReflectionTestUtils.setField(cmd, "_firewallService", _firewallService);
 
         long id = 1L;
-        String uuid = UUID.randomUUID().toString();
+        UUID uuid = UUID.randomUUID();
         long accountId = 2L;
         long networkId = 3L;
 
diff --git a/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java b/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java
@@ -539,7 +539,7 @@ private Long translateUuidToInternalId(final String uuid, final Parameter annota
                         continue;
                     }
                     String entityUuid = ((Identity) objVO).getUuid();
-                    CallContext.current().putApiResourceUuid(annotation.name(), entityUuid);
+                    CallContext.current().putApiResourceUuid(annotation.name(), UUID.fromString(entityUuid));
                 }
                 validateNaturalNumber(internalId, annotation.name());
                 return internalId;
@@ -564,7 +564,7 @@ private Long translateUuidToInternalId(final String uuid, final Parameter annota
             }
             // Return on first non-null Id for the uuid entity
             if (internalId != null){
-                CallContext.current().putApiResourceUuid(annotation.name(), uuid);
+                CallContext.current().putApiResourceUuid(annotation.name(), UUID.fromString(uuid));
                 CallContext.current().putContextParameter(entity, uuid);
                 break;
             }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ protected Stack<CallContext> initialValue() {`
`63`	`63`	`private User user;`
`64`	`64`	`private long userId;`
`65`	`65`	`private final Map<Object, Object> context = new HashMap<Object, Object>();`
`66`		`- private final Map<String, String> apiResourcesUuids = new HashMap<>();`
	`66`	`+ private final Map<String, UUID> apiResourcesUuids = new HashMap<>();`
`67`	`67`	`private Project project;`
`68`	`68`	`private String apiName;`
`69`	`69`
`@@ -389,11 +389,11 @@ public void setEventDisplayEnabled(boolean eventDisplayEnabled) {`
`389`	`389`	`isEventDisplayEnabled = eventDisplayEnabled;`
`390`	`390`	`}`
`391`	`391`
`392`		`- public String getApiResourceUuid(String paramName) {`
	`392`	`+ public UUID getApiResourceUuid(String paramName) {`
`393`	`393`	`return apiResourcesUuids.get(paramName);`
`394`	`394`	`}`
`395`	`395`
`396`		`- public void putApiResourceUuid(String paramName, String uuid) {`
	`396`	`+ public void putApiResourceUuid(String paramName, UUID uuid) {`
`397`	`397`	`apiResourcesUuids.put(paramName, uuid);`
`398`	`398`	`}`
`399`	`399`