fix package name for policy managers

eclipse-xpanse · Jan 19, 2024 · dfb43f6 · dfb43f6
1 parent a6f4857
commit dfb43f6
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 12 deletions.
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
@@ -30,7 +30,7 @@
 import org.eclipse.xpanse.modules.models.system.enums.HealthStatus;
 import org.eclipse.xpanse.modules.observability.OpenTelemetryCollectorHealthCheck;
 import org.eclipse.xpanse.modules.orchestrator.PluginManager;
-import org.eclipse.xpanse.modules.policy.policyman.PolicyManager;
+import org.eclipse.xpanse.modules.policy.PolicyManager;
 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/ServicePolicyManageApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServicePolicyManageApi.java
@@ -20,7 +20,7 @@
 import org.eclipse.xpanse.modules.models.policy.servicepolicy.ServicePolicy;
 import org.eclipse.xpanse.modules.models.policy.servicepolicy.ServicePolicyCreateRequest;
 import org.eclipse.xpanse.modules.models.policy.servicepolicy.ServicePolicyUpdateRequest;
-import org.eclipse.xpanse.modules.policy.policyman.ServicePolicyManager;
+import org.eclipse.xpanse.modules.policy.ServicePolicyManager;
 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/UserPolicyManageApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/UserPolicyManageApi.java
@@ -22,7 +22,7 @@
 import org.eclipse.xpanse.modules.models.policy.userpolicy.UserPolicyQueryRequest;
 import org.eclipse.xpanse.modules.models.policy.userpolicy.UserPolicyUpdateRequest;
 import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
-import org.eclipse.xpanse.modules.policy.policyman.UserPolicyManager;
+import org.eclipse.xpanse.modules.policy.UserPolicyManager;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.annotation.Secured;

diff --git a/...test/java/org/eclipse/xpanse/api/exceptions/handler/PolicyManageExceptionHandlerTest.java b/...test/java/org/eclipse/xpanse/api/exceptions/handler/PolicyManageExceptionHandlerTest.java
@@ -16,7 +16,7 @@
 import org.eclipse.xpanse.modules.models.policy.exceptions.PoliciesValidationFailedException;
 import org.eclipse.xpanse.modules.models.policy.exceptions.PolicyDuplicateException;
 import org.eclipse.xpanse.modules.models.policy.exceptions.PolicyNotFoundException;
-import org.eclipse.xpanse.modules.policy.policyman.UserPolicyManager;
+import org.eclipse.xpanse.modules.policy.UserPolicyManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/PolicyValidator.java b/modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/PolicyValidator.java
@@ -21,8 +21,8 @@
 import org.eclipse.xpanse.modules.models.policy.userpolicy.UserPolicyQueryRequest;
 import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
 import org.eclipse.xpanse.modules.orchestrator.deployment.DeployTask;
-import org.eclipse.xpanse.modules.policy.policyman.PolicyManager;
-import org.eclipse.xpanse.modules.policy.policyman.UserPolicyManager;
+import org.eclipse.xpanse.modules.policy.PolicyManager;
+import org.eclipse.xpanse.modules.policy.UserPolicyManager;
 import org.eclipse.xpanse.modules.policy.policyman.generated.model.EvalResult;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;

diff --git a/...dules/policy/policyman/PolicyManager.java → .../xpanse/modules/policy/PolicyManager.java b/...dules/policy/policyman/PolicyManager.java → .../xpanse/modules/policy/PolicyManager.java
@@ -4,7 +4,7 @@
  *
  */
 
-package org.eclipse.xpanse.modules.policy.policyman;
+package org.eclipse.xpanse.modules.policy;
 
 import jakarta.annotation.Resource;
 import java.util.List;

diff --git a/...olicy/policyman/ServicePolicyManager.java → .../modules/policy/ServicePolicyManager.java b/...olicy/policyman/ServicePolicyManager.java → .../modules/policy/ServicePolicyManager.java
@@ -4,7 +4,7 @@
  *
  */
 
-package org.eclipse.xpanse.modules.policy.policyman;
+package org.eclipse.xpanse.modules.policy;
 
 import jakarta.annotation.Resource;
 import java.util.List;

diff --git a/...s/policy/policyman/UserPolicyManager.java → ...nse/modules/policy/UserPolicyManager.java b/...s/policy/policyman/UserPolicyManager.java → ...nse/modules/policy/UserPolicyManager.java
@@ -4,7 +4,7 @@
  *
  */
 
-package org.eclipse.xpanse.modules.policy.policyman;
+package org.eclipse.xpanse.modules.policy;
 
 import jakarta.annotation.Resource;
 import java.util.Comparator;

diff --git a/...s/policy/src/test/java/org/eclipse/xpanse/modules/policy/policyman/PolicyManagerTest.java b/...s/policy/src/test/java/org/eclipse/xpanse/modules/policy/policyman/PolicyManagerTest.java
@@ -8,6 +8,7 @@
 import org.eclipse.xpanse.modules.models.system.BackendSystemStatus;
 import org.eclipse.xpanse.modules.models.system.enums.BackendSystemType;
 import org.eclipse.xpanse.modules.models.system.enums.HealthStatus;
+import org.eclipse.xpanse.modules.policy.PolicyManager;
 import org.eclipse.xpanse.modules.policy.policyman.generated.api.AdminApi;
 import org.eclipse.xpanse.modules.policy.policyman.generated.api.PoliciesEvaluationApi;
 import org.eclipse.xpanse.modules.policy.policyman.generated.api.PoliciesValidateApi;

diff --git a/...y/src/test/java/org/eclipse/xpanse/modules/policy/policyman/ServicePolicyManagerTest.java b/...y/src/test/java/org/eclipse/xpanse/modules/policy/policyman/ServicePolicyManagerTest.java
@@ -24,6 +24,8 @@
 import org.eclipse.xpanse.modules.models.policy.servicepolicy.ServicePolicyCreateRequest;
 import org.eclipse.xpanse.modules.models.policy.servicepolicy.ServicePolicyUpdateRequest;
 import org.eclipse.xpanse.modules.models.servicetemplate.exceptions.ServiceTemplateNotRegistered;
+import org.eclipse.xpanse.modules.policy.PolicyManager;
+import org.eclipse.xpanse.modules.policy.ServicePolicyManager;
 import org.eclipse.xpanse.modules.security.IdentityProviderManager;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/...licy/src/test/java/org/eclipse/xpanse/modules/policy/policyman/UserPolicyManagerTest.java b/...licy/src/test/java/org/eclipse/xpanse/modules/policy/policyman/UserPolicyManagerTest.java
@@ -21,6 +21,8 @@
 import org.eclipse.xpanse.modules.models.policy.userpolicy.UserPolicyQueryRequest;
 import org.eclipse.xpanse.modules.models.policy.userpolicy.UserPolicyUpdateRequest;
 import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
+import org.eclipse.xpanse.modules.policy.PolicyManager;
+import org.eclipse.xpanse.modules.policy.UserPolicyManager;
 import org.eclipse.xpanse.modules.security.IdentityProviderManager;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/runtime/src/test/java/org/eclipse/xpanse/runtime/AdminServicesApiTest.java b/runtime/src/test/java/org/eclipse/xpanse/runtime/AdminServicesApiTest.java
@@ -27,7 +27,7 @@
 import org.eclipse.xpanse.modules.models.system.enums.BackendSystemType;
 import org.eclipse.xpanse.modules.models.system.enums.HealthStatus;
 import org.eclipse.xpanse.modules.orchestrator.PluginManager;
-import org.eclipse.xpanse.modules.policy.policyman.PolicyManager;
+import org.eclipse.xpanse.modules.policy.PolicyManager;
 import org.eclipse.xpanse.modules.security.IdentityProviderManager;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/runtime/src/test/java/org/eclipse/xpanse/runtime/AdminServicesApiWithTerraformBootTest.java b/runtime/src/test/java/org/eclipse/xpanse/runtime/AdminServicesApiWithTerraformBootTest.java
@@ -27,7 +27,7 @@
 import org.eclipse.xpanse.modules.models.system.SystemStatus;
 import org.eclipse.xpanse.modules.models.system.enums.BackendSystemType;
 import org.eclipse.xpanse.modules.models.system.enums.HealthStatus;
-import org.eclipse.xpanse.modules.policy.policyman.PolicyManager;
+import org.eclipse.xpanse.modules.policy.PolicyManager;
 import org.eclipse.xpanse.modules.security.IdentityProviderManager;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/...ime/src/test/java/org/eclipse/xpanse/runtime/AdminServicesApiWithZitadelAndMysqlTest.java b/...ime/src/test/java/org/eclipse/xpanse/runtime/AdminServicesApiWithZitadelAndMysqlTest.java
@@ -27,7 +27,7 @@
 import org.eclipse.xpanse.modules.models.system.SystemStatus;
 import org.eclipse.xpanse.modules.models.system.enums.BackendSystemType;
 import org.eclipse.xpanse.modules.models.system.enums.HealthStatus;
-import org.eclipse.xpanse.modules.policy.policyman.PolicyManager;
+import org.eclipse.xpanse.modules.policy.PolicyManager;
 import org.eclipse.xpanse.modules.security.IdentityProviderManager;
 import org.eclipse.xpanse.runtime.database.mysql.AbstractMysqlIntegrationTest;
 import org.junit.jupiter.api.Test;