fix package location for internal data classes

eclipse-xpanse · Jan 20, 2024 · d3cd318 · d3cd318
1 parent cbd1835
commit d3cd318
Show file tree

Hide file tree

Showing 177 changed files with 433 additions and 478 deletions.
diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/config/CategoryEnumConverter.java b/modules/api/src/main/java/org/eclipse/xpanse/api/config/CategoryEnumConverter.java
@@ -5,7 +5,7 @@
 
 package org.eclipse.xpanse.api.config;
 
-import org.eclipse.xpanse.modules.models.service.common.enums.Category;
+import org.eclipse.xpanse.modules.models.common.enums.Category;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 

diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/config/CspEnumConverter.java b/modules/api/src/main/java/org/eclipse/xpanse/api/config/CspEnumConverter.java
@@ -5,7 +5,7 @@
 
 package org.eclipse.xpanse.api.config;
 
-import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
+import org.eclipse.xpanse.modules.models.common.enums.Csp;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 

diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/AdminServicesApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/AdminServicesApi.java
@@ -6,9 +6,9 @@
 
 package org.eclipse.xpanse.api.controllers;
 
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ADMIN;
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ISV;
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_USER;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ADMIN;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ISV;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_USER;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -22,8 +22,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.xpanse.modules.database.DatabaseManager;
 import org.eclipse.xpanse.modules.deployment.deployers.terraform.TerraformBootManager;
-import org.eclipse.xpanse.modules.models.security.model.CurrentUserInfo;
-import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
+import org.eclipse.xpanse.modules.models.common.enums.Csp;
 import org.eclipse.xpanse.modules.models.system.BackendSystemStatus;
 import org.eclipse.xpanse.modules.models.system.SystemStatus;
 import org.eclipse.xpanse.modules.models.system.enums.BackendSystemType;
@@ -33,6 +32,7 @@
 import org.eclipse.xpanse.modules.policy.PolicyManager;
 import org.eclipse.xpanse.modules.security.IdentityProviderManager;
 import org.eclipse.xpanse.modules.security.IdentityProviderService;
+import org.eclipse.xpanse.modules.security.common.CurrentUserInfo;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.annotation.Secured;

diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/AuthorizationApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/AuthorizationApi.java
@@ -16,7 +16,7 @@
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.eclipse.xpanse.modules.models.security.model.TokenResponse;
+import org.eclipse.xpanse.modules.models.security.TokenResponse;
 import org.eclipse.xpanse.modules.security.IdentityProviderManager;
 import org.eclipse.xpanse.modules.security.IdentityProviderService;
 import org.springframework.http.HttpStatus;

diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/CredentialsConfigApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/CredentialsConfigApi.java
@@ -7,9 +7,9 @@
 package org.eclipse.xpanse.api.controllers;
 
 
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ADMIN;
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ISV;
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_USER;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ADMIN;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ISV;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_USER;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -19,9 +19,9 @@
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.xpanse.modules.credential.CredentialCenter;
+import org.eclipse.xpanse.modules.models.common.enums.Csp;
 import org.eclipse.xpanse.modules.models.credential.AbstractCredentialInfo;
 import org.eclipse.xpanse.modules.models.credential.enums.CredentialType;
-import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.hateoas.Link;
 import org.springframework.http.HttpStatus;

diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/IsvCloudCredentialsApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/IsvCloudCredentialsApi.java
@@ -6,7 +6,7 @@
 
 package org.eclipse.xpanse.api.controllers;
 
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ISV;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ISV;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -15,10 +15,10 @@
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.xpanse.modules.credential.CredentialCenter;
+import org.eclipse.xpanse.modules.models.common.enums.Csp;
 import org.eclipse.xpanse.modules.models.credential.AbstractCredentialInfo;
 import org.eclipse.xpanse.modules.models.credential.CreateCredential;
 import org.eclipse.xpanse.modules.models.credential.enums.CredentialType;
-import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/IsvServiceDeployApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/IsvServiceDeployApi.java
@@ -6,27 +6,21 @@
 
 package org.eclipse.xpanse.api.controllers;
 
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ISV;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ISV;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.xpanse.modules.deployment.ServiceDetailsViewManager;
-import org.eclipse.xpanse.modules.models.common.exceptions.UserNotLoggedInException;
-import org.eclipse.xpanse.modules.models.service.common.enums.Category;
-import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
+import org.eclipse.xpanse.modules.models.common.enums.Category;
+import org.eclipse.xpanse.modules.models.common.enums.Csp;
 import org.eclipse.xpanse.modules.models.service.deploy.enums.ServiceDeploymentState;
-import org.eclipse.xpanse.modules.models.service.query.ServiceQueryModel;
 import org.eclipse.xpanse.modules.models.service.view.DeployedService;
 import org.eclipse.xpanse.modules.models.service.view.DeployedServiceDetails;
-import org.eclipse.xpanse.modules.security.IdentityProviderManager;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.annotation.Secured;
@@ -51,9 +45,6 @@ public class IsvServiceDeployApi {
     @Resource
     private ServiceDetailsViewManager serviceDetailsViewManager;
 
-    @Resource
-    private IdentityProviderManager identityProviderManager;
-
     /**
      * List all deployed services by a user of ISV.
      *
@@ -76,9 +67,8 @@ public List<DeployedService> listDeployedServicesOfIsv(
             @Parameter(name = "serviceState", description = "deployment state of the service")
             @RequestParam(name = "serviceState", required = false)
                     ServiceDeploymentState serviceState) {
-        ServiceQueryModel query =
-                getServiceQueryModel(category, csp, serviceName, serviceVersion, serviceState);
-        return this.serviceDetailsViewManager.listDeployedServicesOfIsv(query);
+        return this.serviceDetailsViewManager.listDeployedServicesOfIsv(
+                category, csp, serviceName, serviceVersion, serviceState);
     }
 
     /**
@@ -96,30 +86,4 @@ public DeployedServiceDetails getServiceDetailsByIdForIsv(
             @PathVariable("id") String id) {
         return this.serviceDetailsViewManager.getServiceDetailsByIdForIsv(UUID.fromString(id));
     }
-
-    private ServiceQueryModel getServiceQueryModel(Category category, Csp csp,
-            String serviceName, String serviceVersion, ServiceDeploymentState state) {
-        ServiceQueryModel query = new ServiceQueryModel();
-        if (Objects.nonNull(category)) {
-            query.setCategory(category);
-        }
-        if (Objects.nonNull(csp)) {
-            query.setCsp(csp);
-        }
-        if (StringUtils.isNotBlank(serviceName)) {
-            query.setServiceName(serviceName);
-        }
-        if (StringUtils.isNotBlank(serviceVersion)) {
-            query.setServiceVersion(serviceVersion);
-        }
-        if (Objects.nonNull(state)) {
-            query.setServiceState(state);
-        }
-        Optional<String> userIdOptional = identityProviderManager.getCurrentLoginUserId();
-        if (userIdOptional.isEmpty()) {
-            throw new UserNotLoggedInException("Unable to get current login information");
-        }
-        query.setUserId(userIdOptional.get());
-        return query;
-    }
 }
diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceCatalogApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceCatalogApi.java
@@ -6,9 +6,9 @@
 
 package org.eclipse.xpanse.api.controllers;
 
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ADMIN;
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ISV;
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_USER;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ADMIN;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ISV;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_USER;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -19,13 +19,11 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.xpanse.modules.database.servicetemplate.ServiceTemplateEntity;
-import org.eclipse.xpanse.modules.models.service.common.enums.Category;
-import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
+import org.eclipse.xpanse.modules.models.common.enums.Category;
+import org.eclipse.xpanse.modules.models.common.enums.Csp;
 import org.eclipse.xpanse.modules.models.servicetemplate.FlavorBasic;
 import org.eclipse.xpanse.modules.models.servicetemplate.enums.ServiceHostingType;
-import org.eclipse.xpanse.modules.models.servicetemplate.query.ServiceTemplateQueryModel;
 import org.eclipse.xpanse.modules.models.servicetemplate.view.UserOrderableServiceVo;
 import org.eclipse.xpanse.modules.servicetemplate.ServiceTemplateManage;
 import org.springframework.beans.BeanUtils;
@@ -83,20 +81,17 @@ public List<UserOrderableServiceVo> listOrderableServices(
             @Parameter(name = "serviceHostingType", description = "who hosts ths cloud resources")
             @RequestParam(name = "serviceHostingType", required = false)
             ServiceHostingType serviceHostingType) {
-        ServiceTemplateQueryModel query = getServiceTemplatesQueryModel(
-                categoryName, cspName, serviceName, serviceVersion, serviceHostingType);
         List<ServiceTemplateEntity> serviceEntities =
-                serviceTemplateManage.listServiceTemplates(query);
-        String successMsg = String.format("Listing orderable services with query model %s "
-                + "successful.", query);
+                serviceTemplateManage.listServiceTemplates(
+                        categoryName, cspName, serviceName, serviceVersion, serviceHostingType);
         List<UserOrderableServiceVo> userOrderableServiceVos =
                 serviceEntities.stream().map(this::convertToUserOrderableServiceVo).sorted(
                                 Comparator.comparingInt(o -> {
                                     assert o != null;
                                     return o.getCsp().ordinal();
                                 }))
                         .collect(Collectors.toList());
-        log.info(successMsg);
+        log.info(serviceEntities.size() + " orderable services found.");
         return userOrderableServiceVos;
     }
 
@@ -143,31 +138,6 @@ public Link openApi(@PathVariable("id") String id) {
         return Link.of(apiUrl, "OpenApi");
     }
 
-    private ServiceTemplateQueryModel getServiceTemplatesQueryModel(
-            Category category,
-            Csp csp,
-            String serviceName,
-            String serviceVersion,
-            ServiceHostingType serviceHostingType) {
-        ServiceTemplateQueryModel query = new ServiceTemplateQueryModel();
-        if (Objects.nonNull(category)) {
-            query.setCategory(category);
-        }
-        if (Objects.nonNull(csp)) {
-            query.setCsp(csp);
-        }
-        if (StringUtils.isNotBlank(serviceName)) {
-            query.setServiceName(serviceName);
-        }
-        if (StringUtils.isNotBlank(serviceVersion)) {
-            query.setServiceVersion(serviceVersion);
-        }
-        if (Objects.nonNull(serviceHostingType)) {
-            query.setServiceHostingType(serviceHostingType);
-        }
-        return query;
-    }
-
     private UserOrderableServiceVo convertToUserOrderableServiceVo(
             ServiceTemplateEntity serviceTemplateEntity) {
         if (Objects.nonNull(serviceTemplateEntity)) {

diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceDeployerApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceDeployerApi.java
@@ -7,8 +7,8 @@
 package org.eclipse.xpanse.api.controllers;
 
 
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ADMIN;
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_USER;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ADMIN;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_USER;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -19,7 +19,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
@@ -28,12 +27,11 @@
 import org.eclipse.xpanse.modules.deployment.DeployService;
 import org.eclipse.xpanse.modules.deployment.DeployServiceEntityHandler;
 import org.eclipse.xpanse.modules.deployment.ServiceDetailsViewManager;
+import org.eclipse.xpanse.modules.models.common.enums.Category;
+import org.eclipse.xpanse.modules.models.common.enums.Csp;
 import org.eclipse.xpanse.modules.models.response.Response;
-import org.eclipse.xpanse.modules.models.service.common.enums.Category;
-import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
 import org.eclipse.xpanse.modules.models.service.deploy.DeployRequest;
 import org.eclipse.xpanse.modules.models.service.deploy.enums.ServiceDeploymentState;
-import org.eclipse.xpanse.modules.models.service.query.ServiceQueryModel;
 import org.eclipse.xpanse.modules.models.service.view.DeployedService;
 import org.eclipse.xpanse.modules.models.service.view.DeployedServiceDetails;
 import org.eclipse.xpanse.modules.models.service.view.VendorHostedDeployedServiceDetails;
@@ -140,9 +138,8 @@ public List<DeployedService> listDeployedServices(
             @Parameter(name = "serviceState", description = "deployment state of the service")
             @RequestParam(name = "serviceState", required = false)
                     ServiceDeploymentState serviceState) {
-        ServiceQueryModel query =
-                getServiceQueryModel(category, csp, serviceName, serviceVersion, serviceState);
-        return this.serviceDetailsViewManager.listDeployedServices(query);
+        return this.serviceDetailsViewManager.listDeployedServices(
+                category, csp, serviceName, serviceVersion, serviceState);
     }
 
     /**
@@ -254,27 +251,4 @@ public UUID migrate(@Valid @RequestBody MigrateRequest migrateRequest) {
         workflowProcessUtils.asyncStartProcess(MigrateConstants.PROCESS_KEY, variable);
         return newId;
     }
-
-    private ServiceQueryModel getServiceQueryModel(Category category, Csp csp,
-                                                   String serviceName,
-                                                   String serviceVersion,
-                                                   ServiceDeploymentState state) {
-        ServiceQueryModel query = new ServiceQueryModel();
-        if (Objects.nonNull(category)) {
-            query.setCategory(category);
-        }
-        if (Objects.nonNull(csp)) {
-            query.setCsp(csp);
-        }
-        if (StringUtils.isNotBlank(serviceName)) {
-            query.setServiceName(serviceName);
-        }
-        if (StringUtils.isNotBlank(serviceVersion)) {
-            query.setServiceVersion(serviceVersion);
-        }
-        if (Objects.nonNull(state)) {
-            query.setServiceState(state);
-        }
-        return query;
-    }
 }
diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceMetricsApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceMetricsApi.java
@@ -6,8 +6,8 @@
 
 package org.eclipse.xpanse.api.controllers;
 
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ADMIN;
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_USER;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ADMIN;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_USER;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServicePolicyManageApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServicePolicyManageApi.java
@@ -6,8 +6,8 @@
 
 package org.eclipse.xpanse.api.controllers;
 
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ADMIN;
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ISV;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ADMIN;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ISV;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceStateManageApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceStateManageApi.java
@@ -6,8 +6,8 @@
 
 package org.eclipse.xpanse.api.controllers;
 
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_ADMIN;
-import static org.eclipse.xpanse.modules.models.security.constant.RoleConstants.ROLE_USER;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_ADMIN;
+import static org.eclipse.xpanse.modules.security.common.RoleConstants.ROLE_USER;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;