From 55f622e6e15294e7d7157cb0d8a2c6b35fc2d8b4 Mon Sep 17 00:00:00 2001 From: Landry JUGE Date: Wed, 26 Nov 2025 19:47:09 +0100 Subject: [PATCH] Refactor service offering category command imports for consistency --- .../configuration/ConfigurationService.java | 9 +++++--- .../apache/cloudstack/query/QueryService.java | 3 ++- .../com/cloud/api/query/QueryManagerImpl.java | 22 +++++++++++-------- .../vpc/MockConfigurationManagerImpl.java | 9 +++++--- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/api/src/main/java/com/cloud/configuration/ConfigurationService.java b/api/src/main/java/com/cloud/configuration/ConfigurationService.java index 17910ca825a..015d1ebd5ed 100644 --- a/api/src/main/java/com/cloud/configuration/ConfigurationService.java +++ b/api/src/main/java/com/cloud/configuration/ConfigurationService.java @@ -35,11 +35,14 @@ import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd; import org.apache.cloudstack.api.command.admin.network.UpdatePodManagementNetworkIpRangeCmd; import org.apache.cloudstack.api.command.admin.offering.CreateDiskOfferingCmd; import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCategoryCmd; import org.apache.cloudstack.api.command.admin.offering.DeleteDiskOfferingCmd; import org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCategoryCmd; import org.apache.cloudstack.api.command.admin.offering.IsAccountAllowedToCreateOfferingsWithTagsCmd; import org.apache.cloudstack.api.command.admin.offering.UpdateDiskOfferingCmd; import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCategoryCmd; import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd; import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd; import org.apache.cloudstack.api.command.admin.region.CreatePortableIpRangeCmd; @@ -134,7 +137,7 @@ public interface ConfigurationService { * @param cmd - the command specifying name and sort key * @return the newly created service offering category */ - ServiceOfferingCategory createServiceOfferingCategory(org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCategoryCmd cmd); + ServiceOfferingCategory createServiceOfferingCategory(CreateServiceOfferingCategoryCmd cmd); /** * Deletes a service offering category @@ -142,7 +145,7 @@ public interface ConfigurationService { * @param cmd - the command specifying category id * @return true if successful, false otherwise */ - boolean deleteServiceOfferingCategory(org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCategoryCmd cmd); + boolean deleteServiceOfferingCategory(DeleteServiceOfferingCategoryCmd cmd); /** * Updates a service offering category @@ -150,7 +153,7 @@ public interface ConfigurationService { * @param cmd - the command specifying category id, name, and/or sort key * @return updated service offering category */ - ServiceOfferingCategory updateServiceOfferingCategory(org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCategoryCmd cmd); + ServiceOfferingCategory updateServiceOfferingCategory(UpdateServiceOfferingCategoryCmd cmd); /** * Updates a disk offering diff --git a/api/src/main/java/org/apache/cloudstack/query/QueryService.java b/api/src/main/java/org/apache/cloudstack/query/QueryService.java index f604bf04a4f..8474416a810 100644 --- a/api/src/main/java/org/apache/cloudstack/query/QueryService.java +++ b/api/src/main/java/org/apache/cloudstack/query/QueryService.java @@ -36,6 +36,7 @@ import org.apache.cloudstack.api.command.admin.storage.ListStorageAccessGroupsCm import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd; import org.apache.cloudstack.api.command.admin.storage.ListStorageTagsCmd; import org.apache.cloudstack.api.command.admin.storage.heuristics.ListSecondaryStorageSelectorsCmd; +import org.apache.cloudstack.api.command.admin.offering.ListServiceOfferingCategoriesCmd; import org.apache.cloudstack.api.command.admin.user.ListUsersCmd; import org.apache.cloudstack.api.command.user.account.ListAccountsCmd; import org.apache.cloudstack.api.command.user.account.ListProjectAccountsCmd; @@ -185,7 +186,7 @@ public interface QueryService { ListResponse searchForServiceOfferings(ListServiceOfferingsCmd cmd); - ListResponse listServiceOfferingCategories(org.apache.cloudstack.api.command.admin.offering.ListServiceOfferingCategoriesCmd cmd); + ListResponse listServiceOfferingCategories(ListServiceOfferingCategoriesCmd cmd); ListResponse listDataCenters(ListZonesCmd cmd); diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index 4b65d56b976..91b3471a576 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -69,6 +69,7 @@ import org.apache.cloudstack.api.command.admin.host.ListHostsCmd; import org.apache.cloudstack.api.command.admin.internallb.ListInternalLBVMsCmd; import org.apache.cloudstack.api.command.admin.iso.ListIsosCmdByAdmin; import org.apache.cloudstack.api.command.admin.management.ListMgmtsCmd; +import org.apache.cloudstack.api.command.admin.offering.ListServiceOfferingCategoriesCmd; import org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd; import org.apache.cloudstack.api.command.admin.resource.icon.ListResourceIconCmd; import org.apache.cloudstack.api.command.admin.router.GetRouterHealthCheckResultsCmd; @@ -138,6 +139,7 @@ import org.apache.cloudstack.api.response.RouterHealthCheckResultResponse; import org.apache.cloudstack.api.response.SecondaryStorageHeuristicsResponse; import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; +import org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse; import org.apache.cloudstack.api.response.SnapshotResponse; import org.apache.cloudstack.api.response.StorageAccessGroupResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; @@ -296,8 +298,10 @@ import com.cloud.server.ResourceManagerUtil; import com.cloud.server.ResourceMetaDataService; import com.cloud.server.ResourceTag; import com.cloud.server.ResourceTag.ResourceObjectType; +import com.cloud.service.ServiceOfferingCategoryVO; import com.cloud.service.ServiceOfferingDetailsVO; import com.cloud.service.ServiceOfferingVO; +import com.cloud.service.dao.ServiceOfferingCategoryDao; import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.service.dao.ServiceOfferingDetailsDao; import com.cloud.storage.BucketVO; @@ -6244,12 +6248,12 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q } @Override - public ListResponse listServiceOfferingCategories(org.apache.cloudstack.api.command.admin.offering.ListServiceOfferingCategoriesCmd cmd) { + public ListResponse listServiceOfferingCategories(ListServiceOfferingCategoriesCmd cmd) { Long id = cmd.getId(); String name = cmd.getName(); - Filter searchFilter = new Filter(com.cloud.service.ServiceOfferingCategoryVO.class, "sortKey", true, cmd.getStartIndex(), cmd.getPageSizeVal()); - SearchBuilder sb = _serviceOfferingCategoryDao.createSearchBuilder(); + Filter searchFilter = new Filter(ServiceOfferingCategoryVO.class, "sortKey", true, cmd.getStartIndex(), cmd.getPageSizeVal()); + SearchBuilder sb = _serviceOfferingCategoryDao.createSearchBuilder(); if (id != null) { sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ); @@ -6260,7 +6264,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q } sb.done(); - SearchCriteria sc = sb.create(); + SearchCriteria sc = sb.create(); if (id != null) { sc.setParameters("id", id); @@ -6270,12 +6274,12 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q sc.setParameters("name", name); } - Pair, Integer> result = _serviceOfferingCategoryDao.searchAndCount(sc, searchFilter); - ListResponse response = new ListResponse<>(); - List responses = new ArrayList<>(); + Pair, Integer> result = _serviceOfferingCategoryDao.searchAndCount(sc, searchFilter); + ListResponse response = new ListResponse<>(); + List responses = new ArrayList<>(); - for (com.cloud.service.ServiceOfferingCategoryVO category : result.first()) { - org.apache.cloudstack.api.response.ServiceOfferingCategoryResponse categoryResponse = responseGenerator.createServiceOfferingCategoryResponse(category); + for (ServiceOfferingCategoryVO category : result.first()) { + ServiceOfferingCategoryResponse categoryResponse = responseGenerator.createServiceOfferingCategoryResponse(category); responses.add(categoryResponse); } diff --git a/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java index 2c0b0d4db3a..a57efc20ebc 100644 --- a/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java +++ b/server/src/test/java/com/cloud/vpc/MockConfigurationManagerImpl.java @@ -62,11 +62,14 @@ import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd; import org.apache.cloudstack.api.command.admin.network.UpdatePodManagementNetworkIpRangeCmd; import org.apache.cloudstack.api.command.admin.offering.CreateDiskOfferingCmd; import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCategoryCmd; import org.apache.cloudstack.api.command.admin.offering.DeleteDiskOfferingCmd; import org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCategoryCmd; import org.apache.cloudstack.api.command.admin.offering.IsAccountAllowedToCreateOfferingsWithTagsCmd; import org.apache.cloudstack.api.command.admin.offering.UpdateDiskOfferingCmd; import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd; +import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCategoryCmd; import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd; import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd; import org.apache.cloudstack.api.command.admin.region.CreatePortableIpRangeCmd; @@ -148,19 +151,19 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu } @Override - public com.cloud.offering.ServiceOfferingCategory createServiceOfferingCategory(org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCategoryCmd cmd) { + public com.cloud.offering.ServiceOfferingCategory createServiceOfferingCategory(CreateServiceOfferingCategoryCmd cmd) { // TODO Auto-generated method stub return null; } @Override - public boolean deleteServiceOfferingCategory(org.apache.cloudstack.api.command.admin.offering.DeleteServiceOfferingCategoryCmd cmd) { + public boolean deleteServiceOfferingCategory(DeleteServiceOfferingCategoryCmd cmd) { // TODO Auto-generated method stub return false; } @Override - public com.cloud.offering.ServiceOfferingCategory updateServiceOfferingCategory(org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCategoryCmd cmd) { + public com.cloud.offering.ServiceOfferingCategory updateServiceOfferingCategory(UpdateServiceOfferingCategoryCmd cmd) { // TODO Auto-generated method stub return null; }