This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch refactor/phase1-leaf-modules in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 70e7515e03c0c3b34fa2659824d5c22f7bddf7eb Author: yasithdev <[email protected]> AuthorDate: Thu Mar 26 20:06:56 2026 -0500 refactor: consolidate sharing into o.a.a.sharing with model/repository/service/handler/util layers Move sharing registry files from deeply nested sharing/registry/ subtree and service/sharing/ into flat o.a.a.sharing/{model,repository,service,handler,util}. Rename Constants.java to SharingConstants.java to avoid collision. Delete empty sharing/registry/ and service/sharing/ directories. Update all imports across airavata-api, airavata-thrift-server, and persistence.xml. --- .../security/service/GatewayGroupsInitializer.java | 2 +- .../security/service/KeyCloakSecurityManager.java | 2 +- .../service/appcatalog/ApplicationCatalogService.java | 4 ++-- .../airavata/service/credential/CredentialService.java | 4 ++-- .../airavata/service/experiment/ExperimentService.java | 4 ++-- .../airavata/service/gateway/GatewayService.java | 4 ++-- .../groupprofile/GroupResourceProfileService.java | 4 ++-- .../airavata/service/project/ProjectService.java | 4 ++-- .../SharingRegistryServerHandler.java | 10 +++++----- .../SharingServiceDBEventHandler.java | 6 +++--- .../SharingServiceDBEventMessagingFactory.java | 2 +- .../{registry/db/entities => model}/DomainEntity.java | 2 +- .../{registry/db/entities => model}/EntityEntity.java | 2 +- .../{registry/db/entities => model}/EntityPK.java | 2 +- .../db/entities => model}/EntityTypeEntity.java | 2 +- .../{registry/db/entities => model}/EntityTypePK.java | 2 +- .../db/entities => model}/GroupAdminEntity.java | 2 +- .../{registry/db/entities => model}/GroupAdminPK.java | 2 +- .../db/entities => model}/GroupMembershipEntity.java | 2 +- .../db/entities => model}/GroupMembershipPK.java | 2 +- .../db/entities => model}/PermissionTypeEntity.java | 2 +- .../db/entities => model}/PermissionTypePK.java | 2 +- .../{registry/db/entities => model}/SharingEntity.java | 2 +- .../{registry/db/entities => model}/SharingPK.java | 2 +- .../{registry/db/entities => model}/UserEntity.java | 2 +- .../db/entities => model}/UserGroupEntity.java | 2 +- .../{registry/db/entities => model}/UserGroupPK.java | 2 +- .../{registry/db/entities => model}/UserPK.java | 2 +- .../AbstractRepository.java | 10 +++++----- .../repositories => repository}/DomainRepository.java | 4 ++-- .../repositories => repository}/EntityRepository.java | 10 +++++----- .../EntityTypeRepository.java | 6 +++--- .../GroupAdminRepository.java | 6 +++--- .../GroupMembershipRepository.java | 12 ++++++------ .../PermissionTypeRepository.java | 10 +++++----- .../repositories => repository}/SharingRepository.java | 8 ++++---- .../UserGroupRepository.java | 10 +++++----- .../db/repositories => repository}/UserRepository.java | 10 +++++----- .../service}/ResourceSharingService.java | 4 ++-- .../sharing => sharing/service}/SharingHelper.java | 4 ++-- .../airavata => util}/AiravataDataMigrator.java | 6 +++--- .../sharing/{registry/db/utils => util}/Committer.java | 2 +- .../migrator/airavata => util}/ConnectionFactory.java | 2 +- .../{registry/db/utils => util}/DBConstants.java | 2 +- .../sharing/{registry/db/utils => util}/JPAUtils.java | 2 +- .../db/utils => util}/ObjectMapperSingleton.java | 2 +- .../Constants.java => util/SharingConstants.java} | 4 ++-- .../db/utils => util}/SharingRegistryDBInitConfig.java | 2 +- .../db/utils => util}/SharingRegistryJDBCConfig.java | 2 +- .../SharingRegistryServiceClientFactory.java | 2 +- .../utils => util}/ThriftDataModelConversion.java | 2 +- .../src/main/resources/META-INF/persistence.xml | 18 +++++++++--------- .../org/apache/airavata/api/server/AiravataServer.java | 4 ++-- .../api/server/handler/AiravataServerHandler.java | 4 ++-- .../profile/handlers/GroupManagerServiceHandler.java | 2 +- 55 files changed, 115 insertions(+), 115 deletions(-) diff --git a/airavata-api/src/main/java/org/apache/airavata/security/service/GatewayGroupsInitializer.java b/airavata-api/src/main/java/org/apache/airavata/security/service/GatewayGroupsInitializer.java index eb84261cac..28382bf325 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/service/GatewayGroupsInitializer.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/GatewayGroupsInitializer.java @@ -32,7 +32,7 @@ import org.apache.airavata.model.credential.store.PasswordCredential; import org.apache.airavata.registry.api.RegistryService; import org.apache.airavata.registry.api.client.RegistryServiceClientFactory; import org.apache.airavata.registry.api.exception.RegistryServiceException; -import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory; +import org.apache.airavata.sharing.util.SharingRegistryServiceClientFactory; import org.apache.airavata.sharing.registry.models.*; import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService; import org.apache.thrift.TException; diff --git a/airavata-api/src/main/java/org/apache/airavata/security/service/KeyCloakSecurityManager.java b/airavata-api/src/main/java/org/apache/airavata/security/service/KeyCloakSecurityManager.java index 40f6b3625a..b88d423774 100644 --- a/airavata-api/src/main/java/org/apache/airavata/security/service/KeyCloakSecurityManager.java +++ b/airavata-api/src/main/java/org/apache/airavata/security/service/KeyCloakSecurityManager.java @@ -44,7 +44,7 @@ import org.apache.airavata.registry.api.client.RegistryServiceClientFactory; import org.apache.airavata.registry.api.exception.RegistryServiceException; import org.apache.airavata.security.util.AiravataSecurityException; import org.apache.airavata.security.service.authzcache.*; -import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory; +import org.apache.airavata.sharing.util.SharingRegistryServiceClientFactory; import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.apache.airavata.sharing.registry.models.UserGroup; import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/appcatalog/ApplicationCatalogService.java b/airavata-api/src/main/java/org/apache/airavata/service/appcatalog/ApplicationCatalogService.java index 04301e1836..61175a8ca0 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/appcatalog/ApplicationCatalogService.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/appcatalog/ApplicationCatalogService.java @@ -37,12 +37,12 @@ import org.apache.airavata.registry.api.service.handler.RegistryServerHandler; import org.apache.airavata.service.context.RequestContext; import org.apache.airavata.service.exception.ServiceAuthorizationException; import org.apache.airavata.service.exception.ServiceException; -import org.apache.airavata.service.sharing.SharingHelper; +import org.apache.airavata.sharing.service.SharingHelper; import org.apache.airavata.sharing.registry.models.Entity; import org.apache.airavata.sharing.registry.models.EntitySearchField; import org.apache.airavata.sharing.registry.models.SearchCondition; import org.apache.airavata.sharing.registry.models.SearchCriteria; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/credential/CredentialService.java b/airavata-api/src/main/java/org/apache/airavata/service/credential/CredentialService.java index a5596d6a8d..53fab9c2e3 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/credential/CredentialService.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/credential/CredentialService.java @@ -32,12 +32,12 @@ import org.apache.airavata.model.group.ResourceType; import org.apache.airavata.service.context.RequestContext; import org.apache.airavata.service.exception.ServiceAuthorizationException; import org.apache.airavata.service.exception.ServiceException; -import org.apache.airavata.service.sharing.SharingHelper; +import org.apache.airavata.sharing.service.SharingHelper; import org.apache.airavata.sharing.registry.models.Entity; import org.apache.airavata.sharing.registry.models.EntitySearchField; import org.apache.airavata.sharing.registry.models.SearchCondition; import org.apache.airavata.sharing.registry.models.SearchCriteria; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java b/airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java index 347b009579..255d53044b 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/experiment/ExperimentService.java @@ -51,12 +51,12 @@ import org.apache.airavata.service.exception.ServiceException; import org.apache.airavata.service.exception.ServiceNotFoundException; import org.apache.airavata.service.groupprofile.GroupResourceProfileService; import org.apache.airavata.messaging.service.EventPublisher; -import org.apache.airavata.service.sharing.SharingHelper; +import org.apache.airavata.sharing.service.SharingHelper; import org.apache.airavata.sharing.registry.models.Entity; import org.apache.airavata.sharing.registry.models.EntitySearchField; import org.apache.airavata.sharing.registry.models.SearchCondition; import org.apache.airavata.sharing.registry.models.SearchCriteria; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/gateway/GatewayService.java b/airavata-api/src/main/java/org/apache/airavata/service/gateway/GatewayService.java index 09e6bb3f18..ee565be5d0 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/gateway/GatewayService.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/gateway/GatewayService.java @@ -25,11 +25,11 @@ import org.apache.airavata.model.workspace.Gateway; import org.apache.airavata.registry.api.service.handler.RegistryServerHandler; import org.apache.airavata.service.context.RequestContext; import org.apache.airavata.service.exception.ServiceException; -import org.apache.airavata.service.sharing.SharingHelper; +import org.apache.airavata.sharing.service.SharingHelper; import org.apache.airavata.sharing.registry.models.Domain; import org.apache.airavata.sharing.registry.models.EntityType; import org.apache.airavata.sharing.registry.models.PermissionType; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/groupprofile/GroupResourceProfileService.java b/airavata-api/src/main/java/org/apache/airavata/service/groupprofile/GroupResourceProfileService.java index 7240a8fd75..287effc8f0 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/groupprofile/GroupResourceProfileService.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/groupprofile/GroupResourceProfileService.java @@ -34,12 +34,12 @@ import org.apache.airavata.registry.api.service.handler.RegistryServerHandler; import org.apache.airavata.service.context.RequestContext; import org.apache.airavata.service.exception.ServiceAuthorizationException; import org.apache.airavata.service.exception.ServiceException; -import org.apache.airavata.service.sharing.SharingHelper; +import org.apache.airavata.sharing.service.SharingHelper; import org.apache.airavata.sharing.registry.models.Entity; import org.apache.airavata.sharing.registry.models.EntitySearchField; import org.apache.airavata.sharing.registry.models.SearchCondition; import org.apache.airavata.sharing.registry.models.SearchCriteria; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/project/ProjectService.java b/airavata-api/src/main/java/org/apache/airavata/service/project/ProjectService.java index e4c6b42880..43140239a1 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/project/ProjectService.java +++ b/airavata-api/src/main/java/org/apache/airavata/service/project/ProjectService.java @@ -31,12 +31,12 @@ import org.apache.airavata.service.context.RequestContext; import org.apache.airavata.service.exception.ServiceAuthorizationException; import org.apache.airavata.service.exception.ServiceException; import org.apache.airavata.service.exception.ServiceNotFoundException; -import org.apache.airavata.service.sharing.SharingHelper; +import org.apache.airavata.sharing.service.SharingHelper; import org.apache.airavata.sharing.registry.models.Entity; import org.apache.airavata.sharing.registry.models.EntitySearchField; import org.apache.airavata.sharing.registry.models.SearchCondition; import org.apache.airavata.sharing.registry.models.SearchCriteria; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingRegistryServerHandler.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingRegistryServerHandler.java index 284ce295e2..6a9eda09eb 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingRegistryServerHandler.java @@ -17,17 +17,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.server; +package org.apache.airavata.sharing.handler; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.*; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.db.DBInitializer; -import org.apache.airavata.sharing.registry.db.entities.*; -import org.apache.airavata.sharing.registry.db.repositories.*; -import org.apache.airavata.sharing.registry.db.utils.DBConstants; -import org.apache.airavata.sharing.registry.db.utils.SharingRegistryDBInitConfig; +import org.apache.airavata.sharing.model.*; +import org.apache.airavata.sharing.repository.*; +import org.apache.airavata.sharing.util.DBConstants; +import org.apache.airavata.sharing.util.SharingRegistryDBInitConfig; import org.apache.airavata.sharing.registry.models.*; import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService; import org.apache.airavata.sharing.registry.service.cpi.sharing_cpiConstants; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventHandler.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventHandler.java index e6a36d67fa..e2cdbfa7b5 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventHandler.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.messaging; +package org.apache.airavata.sharing.handler; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; @@ -32,14 +32,14 @@ import org.apache.airavata.model.group.ResourceType; import org.apache.airavata.model.user.UserProfile; import org.apache.airavata.model.workspace.Gateway; import org.apache.airavata.model.workspace.Project; -import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory; +import org.apache.airavata.sharing.util.SharingRegistryServiceClientFactory; import org.apache.airavata.sharing.registry.models.Domain; import org.apache.airavata.sharing.registry.models.Entity; import org.apache.airavata.sharing.registry.models.PermissionType; import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.apache.airavata.sharing.registry.models.User; import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService; -import org.apache.airavata.sharing.registry.utils.ThriftDataModelConversion; +import org.apache.airavata.sharing.util.ThriftDataModelConversion; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventMessagingFactory.java b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventMessagingFactory.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventMessagingFactory.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventMessagingFactory.java index e7f1c100e2..b937ff7432 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventMessagingFactory.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/handler/SharingServiceDBEventMessagingFactory.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.messaging; +package org.apache.airavata.sharing.handler; import java.util.List; import org.apache.airavata.common.exception.AiravataException; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/DomainEntity.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/DomainEntity.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/DomainEntity.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/DomainEntity.java index 104a5768e7..5a404e49ce 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/DomainEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/DomainEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.*; import org.slf4j.Logger; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityEntity.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityEntity.java index 18af04b1dc..6be5f9febd 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.*; import org.slf4j.Logger; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityPK.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityPK.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityPK.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityPK.java index 70bcecb111..2938a5cd7a 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityPK.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityPK.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.Column; import jakarta.persistence.Id; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypeEntity.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityTypeEntity.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypeEntity.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityTypeEntity.java index 0cfabb9991..e398e4535d 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypeEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityTypeEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.*; import org.slf4j.Logger; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypePK.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityTypePK.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypePK.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityTypePK.java index dc5981b24c..12defcc839 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityTypePK.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/EntityTypePK.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.Column; import jakarta.persistence.Id; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupAdminEntity.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupAdminEntity.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupAdminEntity.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupAdminEntity.java index 0796265d73..6057127041 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupAdminEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupAdminEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.*; import org.slf4j.Logger; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupAdminPK.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupAdminPK.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupAdminPK.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupAdminPK.java index eaea2bf16e..7256a66be7 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupAdminPK.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupAdminPK.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.Column; import jakarta.persistence.Id; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipEntity.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupMembershipEntity.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipEntity.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupMembershipEntity.java index 621f43f533..4744475af4 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupMembershipEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.*; import org.slf4j.Logger; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipPK.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupMembershipPK.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipPK.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupMembershipPK.java index e3bb0f9b6a..a7770fd5c3 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/GroupMembershipPK.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/GroupMembershipPK.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.Column; import jakarta.persistence.Id; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypeEntity.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/PermissionTypeEntity.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypeEntity.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/PermissionTypeEntity.java index 33a8397025..251db81bf3 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypeEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/PermissionTypeEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.*; import org.slf4j.Logger; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypePK.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/PermissionTypePK.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypePK.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/PermissionTypePK.java index dc6dd3bd7e..6f8c43a0cd 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/PermissionTypePK.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/PermissionTypePK.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.Column; import jakarta.persistence.Id; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/SharingEntity.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/SharingEntity.java index 4dc36b31fd..e12983fdf4 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/SharingEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.*; import org.slf4j.Logger; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingPK.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/SharingPK.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingPK.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/SharingPK.java index 22f704cadd..49f0e51b36 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingPK.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/SharingPK.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.Column; import jakarta.persistence.Id; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/UserEntity.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/UserEntity.java index 2ddc649609..1554826954 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/UserEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.*; import org.slf4j.Logger; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupEntity.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/UserGroupEntity.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupEntity.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/UserGroupEntity.java index a93ee70e17..6acae1100b 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupEntity.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/UserGroupEntity.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.*; import java.util.List; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupPK.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/UserGroupPK.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupPK.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/UserGroupPK.java index 72cd631cf0..772d970900 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserGroupPK.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/UserGroupPK.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.Column; import jakarta.persistence.Id; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserPK.java b/airavata-api/src/main/java/org/apache/airavata/sharing/model/UserPK.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserPK.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/model/UserPK.java index a6effcee79..16e201fe86 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/entities/UserPK.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/model/UserPK.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.entities; +package org.apache.airavata.sharing.model; import jakarta.persistence.Column; import jakarta.persistence.Id; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/AbstractRepository.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/repository/AbstractRepository.java index 8b7c471488..33f5ab55cf 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/AbstractRepository.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.repositories; +package org.apache.airavata.sharing.repository; import com.github.dozermapper.core.Mapper; import jakarta.persistence.EntityManager; @@ -25,10 +25,10 @@ import jakarta.persistence.Query; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.airavata.sharing.registry.db.utils.Committer; -import org.apache.airavata.sharing.registry.db.utils.DBConstants; -import org.apache.airavata.sharing.registry.db.utils.JPAUtils; -import org.apache.airavata.sharing.registry.db.utils.ObjectMapperSingleton; +import org.apache.airavata.sharing.util.Committer; +import org.apache.airavata.sharing.util.DBConstants; +import org.apache.airavata.sharing.util.JPAUtils; +import org.apache.airavata.sharing.util.ObjectMapperSingleton; import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/DomainRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/DomainRepository.java similarity index 89% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/DomainRepository.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/repository/DomainRepository.java index b26be676e5..93dd55698a 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/DomainRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/DomainRepository.java @@ -17,9 +17,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.repositories; +package org.apache.airavata.sharing.repository; -import org.apache.airavata.sharing.registry.db.entities.DomainEntity; +import org.apache.airavata.sharing.model.DomainEntity; import org.apache.airavata.sharing.registry.models.Domain; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/EntityRepository.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/repository/EntityRepository.java index f215095c67..a31ae7bf39 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/EntityRepository.java @@ -17,13 +17,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.repositories; +package org.apache.airavata.sharing.repository; import java.util.*; -import org.apache.airavata.sharing.registry.db.entities.EntityEntity; -import org.apache.airavata.sharing.registry.db.entities.EntityPK; -import org.apache.airavata.sharing.registry.db.utils.DBConstants; -import org.apache.airavata.sharing.registry.db.utils.SharingRegistryJDBCConfig; +import org.apache.airavata.sharing.model.EntityEntity; +import org.apache.airavata.sharing.model.EntityPK; +import org.apache.airavata.sharing.util.DBConstants; +import org.apache.airavata.sharing.util.SharingRegistryJDBCConfig; import org.apache.airavata.sharing.registry.models.*; public class EntityRepository extends AbstractRepository<Entity, EntityEntity, EntityPK> { diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityTypeRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/EntityTypeRepository.java similarity index 85% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityTypeRepository.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/repository/EntityTypeRepository.java index 2c1d5f908e..cf7ef0ac5b 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityTypeRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/EntityTypeRepository.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.repositories; +package org.apache.airavata.sharing.repository; -import org.apache.airavata.sharing.registry.db.entities.EntityTypeEntity; -import org.apache.airavata.sharing.registry.db.entities.EntityTypePK; +import org.apache.airavata.sharing.model.EntityTypeEntity; +import org.apache.airavata.sharing.model.EntityTypePK; import org.apache.airavata.sharing.registry.models.EntityType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupAdminRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/GroupAdminRepository.java similarity index 85% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupAdminRepository.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/repository/GroupAdminRepository.java index 041e914315..190108ac32 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupAdminRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/GroupAdminRepository.java @@ -17,10 +17,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.repositories; +package org.apache.airavata.sharing.repository; -import org.apache.airavata.sharing.registry.db.entities.GroupAdminEntity; -import org.apache.airavata.sharing.registry.db.entities.GroupAdminPK; +import org.apache.airavata.sharing.model.GroupAdminEntity; +import org.apache.airavata.sharing.model.GroupAdminPK; import org.apache.airavata.sharing.registry.models.GroupAdmin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/GroupMembershipRepository.java similarity index 94% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/repository/GroupMembershipRepository.java index 2361b43887..4b8e2274ab 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/GroupMembershipRepository.java @@ -17,14 +17,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.repositories; +package org.apache.airavata.sharing.repository; import java.util.*; -import org.apache.airavata.sharing.registry.db.entities.GroupMembershipEntity; -import org.apache.airavata.sharing.registry.db.entities.GroupMembershipPK; -import org.apache.airavata.sharing.registry.db.entities.UserEntity; -import org.apache.airavata.sharing.registry.db.entities.UserGroupEntity; -import org.apache.airavata.sharing.registry.db.utils.DBConstants; +import org.apache.airavata.sharing.model.GroupMembershipEntity; +import org.apache.airavata.sharing.model.GroupMembershipPK; +import org.apache.airavata.sharing.model.UserEntity; +import org.apache.airavata.sharing.model.UserGroupEntity; +import org.apache.airavata.sharing.util.DBConstants; import org.apache.airavata.sharing.registry.models.*; public class GroupMembershipRepository diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/PermissionTypeRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/PermissionTypeRepository.java similarity index 85% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/PermissionTypeRepository.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/repository/PermissionTypeRepository.java index 3a1d841a27..a55cc452f2 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/PermissionTypeRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/PermissionTypeRepository.java @@ -17,16 +17,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.repositories; +package org.apache.airavata.sharing.repository; import java.util.HashMap; import java.util.List; -import org.apache.airavata.sharing.registry.db.entities.PermissionTypeEntity; -import org.apache.airavata.sharing.registry.db.entities.PermissionTypePK; -import org.apache.airavata.sharing.registry.db.utils.DBConstants; +import org.apache.airavata.sharing.model.PermissionTypeEntity; +import org.apache.airavata.sharing.model.PermissionTypePK; +import org.apache.airavata.sharing.util.DBConstants; import org.apache.airavata.sharing.registry.models.PermissionType; import org.apache.airavata.sharing.registry.models.SharingRegistryException; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/SharingRepository.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/repository/SharingRepository.java index 7bf5ea645a..0693146da9 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/SharingRepository.java @@ -17,15 +17,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.repositories; +package org.apache.airavata.sharing.repository; import jakarta.persistence.Query; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.airavata.sharing.registry.db.entities.SharingEntity; -import org.apache.airavata.sharing.registry.db.entities.SharingPK; -import org.apache.airavata.sharing.registry.db.utils.DBConstants; +import org.apache.airavata.sharing.model.SharingEntity; +import org.apache.airavata.sharing.model.SharingPK; +import org.apache.airavata.sharing.util.DBConstants; import org.apache.airavata.sharing.registry.models.Sharing; import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.apache.airavata.sharing.registry.models.SharingType; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserGroupRepository.java similarity index 94% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserGroupRepository.java index 3199890023..b63c7ff3a0 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserGroupRepository.java @@ -17,17 +17,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.repositories; +package org.apache.airavata.sharing.repository; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.apache.airavata.sharing.registry.db.entities.SharingEntity; -import org.apache.airavata.sharing.registry.db.entities.UserGroupEntity; -import org.apache.airavata.sharing.registry.db.entities.UserGroupPK; -import org.apache.airavata.sharing.registry.db.utils.DBConstants; +import org.apache.airavata.sharing.model.SharingEntity; +import org.apache.airavata.sharing.model.UserGroupEntity; +import org.apache.airavata.sharing.model.UserGroupPK; +import org.apache.airavata.sharing.util.DBConstants; import org.apache.airavata.sharing.registry.models.GroupCardinality; import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.apache.airavata.sharing.registry.models.SharingType; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserRepository.java similarity index 92% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserRepository.java index acc344ead9..13c3ecf0f9 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/repository/UserRepository.java @@ -17,17 +17,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.repositories; +package org.apache.airavata.sharing.repository; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.apache.airavata.sharing.registry.db.entities.SharingEntity; -import org.apache.airavata.sharing.registry.db.entities.UserEntity; -import org.apache.airavata.sharing.registry.db.entities.UserPK; -import org.apache.airavata.sharing.registry.db.utils.DBConstants; +import org.apache.airavata.sharing.model.SharingEntity; +import org.apache.airavata.sharing.model.UserEntity; +import org.apache.airavata.sharing.model.UserPK; +import org.apache.airavata.sharing.util.DBConstants; import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.apache.airavata.sharing.registry.models.SharingType; import org.apache.airavata.sharing.registry.models.User; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/sharing/ResourceSharingService.java b/airavata-api/src/main/java/org/apache/airavata/sharing/service/ResourceSharingService.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/service/sharing/ResourceSharingService.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/service/ResourceSharingService.java index dbe443a9ec..4ef41e266a 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/sharing/ResourceSharingService.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/service/ResourceSharingService.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.sharing; +package org.apache.airavata.sharing.service; import java.util.ArrayList; import java.util.Arrays; @@ -35,7 +35,7 @@ import org.apache.airavata.service.exception.ServiceAuthorizationException; import org.apache.airavata.service.exception.ServiceException; import org.apache.airavata.sharing.registry.models.User; import org.apache.airavata.sharing.registry.models.UserGroup; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/service/sharing/SharingHelper.java b/airavata-api/src/main/java/org/apache/airavata/sharing/service/SharingHelper.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/service/sharing/SharingHelper.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/service/SharingHelper.java index 5b1eaa2d07..7f754afacf 100644 --- a/airavata-api/src/main/java/org/apache/airavata/service/sharing/SharingHelper.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/service/SharingHelper.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.service.sharing; +package org.apache.airavata.sharing.service; import java.util.Arrays; import org.apache.airavata.common.config.ServerSettings; @@ -27,7 +27,7 @@ import org.apache.airavata.registry.api.service.handler.RegistryServerHandler; import org.apache.airavata.security.service.GatewayGroupsInitializer; import org.apache.airavata.sharing.registry.models.Entity; import org.apache.airavata.sharing.registry.models.PermissionType; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; import org.apache.thrift.TException; public class SharingHelper { diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/AiravataDataMigrator.java similarity index 99% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/util/AiravataDataMigrator.java index f8b93d6077..a116ce7db9 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/AiravataDataMigrator.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.migrator.airavata; +package org.apache.airavata.sharing.util; import java.sql.Connection; import java.sql.ResultSet; @@ -75,8 +75,8 @@ import org.apache.airavata.sharing.registry.models.SearchCondition; import org.apache.airavata.sharing.registry.models.SearchCriteria; import org.apache.airavata.sharing.registry.models.User; import org.apache.airavata.sharing.registry.models.UserGroup; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; -import org.apache.airavata.sharing.registry.utils.ThriftDataModelConversion; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; +import org.apache.airavata.sharing.util.ThriftDataModelConversion; import org.apache.thrift.TException; public class AiravataDataMigrator { diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/Committer.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/Committer.java similarity index 94% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/Committer.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/util/Committer.java index 0feac7a218..83f7578075 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/Committer.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/Committer.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.utils; +package org.apache.airavata.sharing.util; @FunctionalInterface public interface Committer<T, R> { diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/ConnectionFactory.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/ConnectionFactory.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/ConnectionFactory.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/util/ConnectionFactory.java index 03e2fd9e21..334e6ab5bc 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/ConnectionFactory.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/ConnectionFactory.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.migrator.airavata; +package org.apache.airavata.sharing.util; import java.sql.Connection; import java.sql.DriverManager; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/DBConstants.java similarity index 98% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/util/DBConstants.java index 1716a11bbd..b51511fd4c 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/DBConstants.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.utils; +package org.apache.airavata.sharing.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/JPAUtils.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/util/JPAUtils.java index 85e8de796c..70a05cf5dc 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/JPAUtils.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.utils; +package org.apache.airavata.sharing.util; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/ObjectMapperSingleton.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/ObjectMapperSingleton.java similarity index 95% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/ObjectMapperSingleton.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/util/ObjectMapperSingleton.java index eaeee21d67..15e40d3058 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/ObjectMapperSingleton.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/ObjectMapperSingleton.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.utils; +package org.apache.airavata.sharing.util; import com.github.dozermapper.core.DozerBeanMapperBuilder; import com.github.dozermapper.core.Mapper; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/utils/Constants.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingConstants.java similarity index 94% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/utils/Constants.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingConstants.java index 6aa37d7c58..1a01c7021f 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/utils/Constants.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingConstants.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.utils; +package org.apache.airavata.sharing.util; import java.util.ArrayList; import java.util.List; @@ -26,7 +26,7 @@ import org.apache.airavata.messaging.util.DBEventService; /** * Created by Ajinkya on 3/28/17. */ -public class Constants { +public class SharingConstants { /** * List of publishers in which sharing service is interested. * Add publishers as required diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/SharingRegistryDBInitConfig.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryDBInitConfig.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/SharingRegistryDBInitConfig.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryDBInitConfig.java index daf8a268bd..816e3a9058 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/SharingRegistryDBInitConfig.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryDBInitConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.utils; +package org.apache.airavata.sharing.util; import org.apache.airavata.common.db.DBInitConfig; import org.apache.airavata.common.db.JDBCConfig; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/SharingRegistryJDBCConfig.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryJDBCConfig.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/SharingRegistryJDBCConfig.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryJDBCConfig.java index 0ca0e078ca..f0c0689378 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/db/utils/SharingRegistryJDBCConfig.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryJDBCConfig.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.db.utils; +package org.apache.airavata.sharing.util; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.db.JDBCConfig; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/client/SharingRegistryServiceClientFactory.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryServiceClientFactory.java similarity index 97% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/client/SharingRegistryServiceClientFactory.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryServiceClientFactory.java index b055c54c4d..c9fa4c1de4 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/client/SharingRegistryServiceClientFactory.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/SharingRegistryServiceClientFactory.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.client; +package org.apache.airavata.sharing.util; import org.apache.airavata.sharing.registry.models.SharingRegistryException; import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService; diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/utils/ThriftDataModelConversion.java b/airavata-api/src/main/java/org/apache/airavata/sharing/util/ThriftDataModelConversion.java similarity index 96% rename from airavata-api/src/main/java/org/apache/airavata/sharing/registry/utils/ThriftDataModelConversion.java rename to airavata-api/src/main/java/org/apache/airavata/sharing/util/ThriftDataModelConversion.java index 840bcb7971..498157fc5e 100644 --- a/airavata-api/src/main/java/org/apache/airavata/sharing/registry/utils/ThriftDataModelConversion.java +++ b/airavata-api/src/main/java/org/apache/airavata/sharing/util/ThriftDataModelConversion.java @@ -17,7 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.airavata.sharing.registry.utils; +package org.apache.airavata.sharing.util; import org.apache.airavata.model.user.UserProfile; import org.apache.airavata.sharing.registry.models.User; diff --git a/airavata-api/src/main/resources/META-INF/persistence.xml b/airavata-api/src/main/resources/META-INF/persistence.xml index 3841f3142c..e314714f89 100644 --- a/airavata-api/src/main/resources/META-INF/persistence.xml +++ b/airavata-api/src/main/resources/META-INF/persistence.xml @@ -184,15 +184,15 @@ </persistence-unit> <persistence-unit name="airavata-sharing-registry"> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <class>org.apache.airavata.sharing.registry.db.entities.DomainEntity</class> - <class>org.apache.airavata.sharing.registry.db.entities.EntityEntity</class> - <class>org.apache.airavata.sharing.registry.db.entities.EntityTypeEntity</class> - <class>org.apache.airavata.sharing.registry.db.entities.GroupMembershipEntity</class> - <class>org.apache.airavata.sharing.registry.db.entities.PermissionTypeEntity</class> - <class>org.apache.airavata.sharing.registry.db.entities.SharingEntity</class> - <class>org.apache.airavata.sharing.registry.db.entities.UserEntity</class> - <class>org.apache.airavata.sharing.registry.db.entities.GroupAdminEntity</class> - <class>org.apache.airavata.sharing.registry.db.entities.UserGroupEntity</class> + <class>org.apache.airavata.sharing.model.DomainEntity</class> + <class>org.apache.airavata.sharing.model.EntityEntity</class> + <class>org.apache.airavata.sharing.model.EntityTypeEntity</class> + <class>org.apache.airavata.sharing.model.GroupMembershipEntity</class> + <class>org.apache.airavata.sharing.model.PermissionTypeEntity</class> + <class>org.apache.airavata.sharing.model.SharingEntity</class> + <class>org.apache.airavata.sharing.model.UserEntity</class> + <class>org.apache.airavata.sharing.model.GroupAdminEntity</class> + <class>org.apache.airavata.sharing.model.UserGroupEntity</class> <exclude-unlisted-classes>true</exclude-unlisted-classes> <properties> <property name="openjpa.jdbc.MappingDefaults" diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java index 0fc16788cd..ca8ca1e7b6 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/AiravataServer.java @@ -72,8 +72,8 @@ import org.apache.airavata.service.profile.tenant.cpi.profile_tenant_cpiConstant import org.apache.airavata.security.profile.user.core.utils.UserProfileCatalogDBInitConfig; import org.apache.airavata.service.profile.user.cpi.UserProfileService; import org.apache.airavata.service.profile.user.cpi.profile_user_cpiConstants; -import org.apache.airavata.sharing.registry.db.utils.SharingRegistryDBInitConfig; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.airavata.sharing.util.SharingRegistryDBInitConfig; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService; import org.apache.thrift.TMultiplexedProcessor; import org.apache.thrift.server.TServer; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index 96f2a141dc..6db98e9cb4 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -87,9 +87,9 @@ import org.apache.airavata.service.resource.ResourceService; import org.apache.airavata.service.resourceprofile.GatewayResourceProfileService; import org.apache.airavata.service.resourceprofile.UserResourceProfileService; import org.apache.airavata.security.service.interceptor.SecurityCheck; -import org.apache.airavata.service.sharing.ResourceSharingService; +import org.apache.airavata.sharing.service.ResourceSharingService; import org.apache.airavata.sharing.registry.models.*; -import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler; +import org.apache.airavata.sharing.handler.SharingRegistryServerHandler; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java index 280e73aa1d..fa1200800a 100644 --- a/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java +++ b/airavata-thrift-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java @@ -35,7 +35,7 @@ import org.apache.airavata.service.profile.groupmanager.cpi.exception.GroupManag import org.apache.airavata.service.profile.groupmanager.cpi.group_manager_cpiConstants; import org.apache.airavata.security.profile.user.core.repositories.UserProfileRepository; import org.apache.airavata.security.service.interceptor.SecurityCheck; -import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory; +import org.apache.airavata.sharing.util.SharingRegistryServiceClientFactory; import org.apache.airavata.sharing.registry.models.GroupCardinality; import org.apache.airavata.sharing.registry.models.GroupType; import org.apache.airavata.sharing.registry.models.SharingRegistryException;
