This is an automated email from the ASF dual-hosted git repository.
yasithdev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new adb5241096 refactor: move the research Resource catalog from
sharing-service into research-service (#643)
adb5241096 is described below
commit adb52410968b61f4a9c74486dda495ca13905b6f
Author: Yasith Jayawardana <[email protected]>
AuthorDate: Sun Jun 7 21:57:46 2026 -0400
refactor: move the research Resource catalog from sharing-service into
research-service (#643)
ResourceEntity (table RESOURCE), TagEntity, ResourceStarEntity, their three
repositories and the four research-only enums
(ResourceTypeEnum/PrivacyEnum/StateEnum/StatusEnum) physically lived in
sharing-service but were referenced only by research-service, which reached
into sharing's internal model/repository packages 28 times. This is a
package-only relocation (org.apache.airavata.sharing.{model,repository} ->
research.{model,repository}) with no schema change: the RESOURCE/TAG/RESOU [...]
---
.../research/config/DevDataInitializer.java | 10 ++++-----
.../research/grpc/ResearchResourceGrpcHandler.java | 8 ++++----
.../research/model/DatasetResourceEntity.java | 2 --
.../airavata/research}/model/PrivacyEnum.java | 2 +-
.../research/model/RepositoryResourceEntity.java | 2 --
.../research/model/ResearchProjectEntity.java | 1 -
.../airavata/research}/model/ResourceEntity.java | 2 +-
.../research}/model/ResourceStarEntity.java | 2 +-
.../airavata/research}/model/ResourceTypeEnum.java | 2 +-
.../apache/airavata/research}/model/StateEnum.java | 2 +-
.../airavata/research}/model/StatusEnum.java | 2 +-
.../apache/airavata/research}/model/TagEntity.java | 2 +-
.../repository/ResearchProjectRepository.java | 2 +-
.../research}/repository/ResourceRepository.java | 6 +++---
.../repository/ResourceStarRepository.java | 8 ++++----
.../research}/repository/TagRepository.java | 4 ++--
.../research/service/ResearchProjectService.java | 8 ++++----
.../research/service/ResearchResourceService.java | 24 +++++++++++-----------
.../src/test/resources/META-INF/persistence.xml | 6 +++---
19 files changed, 45 insertions(+), 50 deletions(-)
diff --git
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/config/DevDataInitializer.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/config/DevDataInitializer.java
index 0cee9b2e78..0292a316c9 100644
---
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/config/DevDataInitializer.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/config/DevDataInitializer.java
@@ -22,14 +22,14 @@ package org.apache.airavata.research.config;
import java.util.HashSet;
import java.util.Set;
import org.apache.airavata.research.model.DatasetResourceEntity;
+import org.apache.airavata.research.model.PrivacyEnum;
import org.apache.airavata.research.model.RepositoryResourceEntity;
import org.apache.airavata.research.model.ResearchProjectEntity;
+import org.apache.airavata.research.model.StatusEnum;
+import org.apache.airavata.research.model.TagEntity;
import org.apache.airavata.research.repository.ResearchProjectRepository;
-import org.apache.airavata.sharing.model.PrivacyEnum;
-import org.apache.airavata.sharing.model.StatusEnum;
-import org.apache.airavata.sharing.model.TagEntity;
-import org.apache.airavata.sharing.repository.ResourceRepository;
-import org.apache.airavata.sharing.repository.TagRepository;
+import org.apache.airavata.research.repository.ResourceRepository;
+import org.apache.airavata.research.repository.TagRepository;
import org.springframework.boot.CommandLineRunner;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
diff --git
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/grpc/ResearchResourceGrpcHandler.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/grpc/ResearchResourceGrpcHandler.java
index dbd497359e..4856237a0d 100644
---
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/grpc/ResearchResourceGrpcHandler.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/grpc/ResearchResourceGrpcHandler.java
@@ -29,13 +29,13 @@ import java.util.stream.Collectors;
import org.apache.airavata.grpc.GrpcStatusMapper;
import org.apache.airavata.research.*;
import org.apache.airavata.research.model.DatasetResourceEntity;
+import org.apache.airavata.research.model.PrivacyEnum;
import org.apache.airavata.research.model.RepositoryResourceEntity;
import org.apache.airavata.research.model.ResearchProjectEntity;
+import org.apache.airavata.research.model.ResourceEntity;
+import org.apache.airavata.research.model.ResourceTypeEnum;
import org.apache.airavata.research.service.ResearchProjectService;
import org.apache.airavata.research.service.ResearchResourceService;
-import org.apache.airavata.sharing.model.PrivacyEnum;
-import org.apache.airavata.sharing.model.ResourceEntity;
-import org.apache.airavata.sharing.model.ResourceTypeEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Page;
@@ -145,7 +145,7 @@ public class ResearchResourceGrpcHandler extends
ResearchResourceServiceGrpc.Res
@Override
public void getTags(GetAllResourcesRequest request,
StreamObserver<JsonListResponse> responseObserver) {
try {
- List<org.apache.airavata.sharing.model.TagEntity> tags =
resourceService.getAllTagsByAlphabeticalOrder();
+ List<org.apache.airavata.research.model.TagEntity> tags =
resourceService.getAllTagsByAlphabeticalOrder();
List<String> jsonList =
tags.stream().map(this::writeJson).collect(Collectors.toList());
responseObserver.onNext(
JsonListResponse.newBuilder().addAllItems(jsonList).build());
diff --git
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/DatasetResourceEntity.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/DatasetResourceEntity.java
index 6dbc7097e2..790d911b09 100644
---
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/DatasetResourceEntity.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/DatasetResourceEntity.java
@@ -22,8 +22,6 @@ package org.apache.airavata.research.model;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
-import org.apache.airavata.sharing.model.ResourceEntity;
-import org.apache.airavata.sharing.model.ResourceTypeEnum;
@Entity
@Table(name = "DATASET_RESOURCE")
diff --git
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/PrivacyEnum.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/PrivacyEnum.java
similarity index 95%
rename from
airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/PrivacyEnum.java
rename to
airavata-api/research-service/src/main/java/org/apache/airavata/research/model/PrivacyEnum.java
index d223d90c49..cb9782b027 100644
---
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/PrivacyEnum.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/PrivacyEnum.java
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.airavata.sharing.model;
+package org.apache.airavata.research.model;
public enum PrivacyEnum {
PUBLIC,
diff --git
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/RepositoryResourceEntity.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/RepositoryResourceEntity.java
index fc72aed078..231666c3e3 100644
---
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/RepositoryResourceEntity.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/RepositoryResourceEntity.java
@@ -22,8 +22,6 @@ package org.apache.airavata.research.model;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
-import org.apache.airavata.sharing.model.ResourceEntity;
-import org.apache.airavata.sharing.model.ResourceTypeEnum;
@Entity
@Table(name = "REPOSITORY_RESOURCE")
diff --git
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResearchProjectEntity.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResearchProjectEntity.java
index 8e45269c23..b249931446 100644
---
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResearchProjectEntity.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResearchProjectEntity.java
@@ -35,7 +35,6 @@ import jakarta.persistence.Table;
import java.time.Instant;
import java.util.HashSet;
import java.util.Set;
-import org.apache.airavata.sharing.model.StateEnum;
import org.hibernate.annotations.UuidGenerator;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
diff --git
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/ResourceEntity.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResourceEntity.java
similarity index 99%
rename from
airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/ResourceEntity.java
rename to
airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResourceEntity.java
index b47ca6f8b6..90d5906d92 100644
---
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/ResourceEntity.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResourceEntity.java
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.airavata.sharing.model;
+package org.apache.airavata.research.model;
import jakarta.persistence.CascadeType;
import jakarta.persistence.CollectionTable;
diff --git
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/ResourceStarEntity.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResourceStarEntity.java
similarity index 97%
rename from
airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/ResourceStarEntity.java
rename to
airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResourceStarEntity.java
index c54edf818b..1e1dd9d861 100644
---
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/ResourceStarEntity.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResourceStarEntity.java
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.airavata.sharing.model;
+package org.apache.airavata.research.model;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
diff --git
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/ResourceTypeEnum.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResourceTypeEnum.java
similarity index 96%
rename from
airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/ResourceTypeEnum.java
rename to
airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResourceTypeEnum.java
index 401aa5d00f..39d49bb07f 100644
---
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/ResourceTypeEnum.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/ResourceTypeEnum.java
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.airavata.sharing.model;
+package org.apache.airavata.research.model;
public enum ResourceTypeEnum {
NOTEBOOK("NOTEBOOK"),
diff --git
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/StateEnum.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/StateEnum.java
similarity index 95%
rename from
airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/StateEnum.java
rename to
airavata-api/research-service/src/main/java/org/apache/airavata/research/model/StateEnum.java
index 746182ee49..546e9aefca 100644
---
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/StateEnum.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/StateEnum.java
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.airavata.sharing.model;
+package org.apache.airavata.research.model;
public enum StateEnum {
ACTIVE,
diff --git
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/StatusEnum.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/StatusEnum.java
similarity index 95%
rename from
airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/StatusEnum.java
rename to
airavata-api/research-service/src/main/java/org/apache/airavata/research/model/StatusEnum.java
index 660244effa..7c36298f5a 100644
---
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/StatusEnum.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/StatusEnum.java
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.airavata.sharing.model;
+package org.apache.airavata.research.model;
public enum StatusEnum {
NONE,
diff --git
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/TagEntity.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/TagEntity.java
similarity index 97%
rename from
airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/TagEntity.java
rename to
airavata-api/research-service/src/main/java/org/apache/airavata/research/model/TagEntity.java
index 50eb367cb1..8a3697c594 100644
---
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/model/TagEntity.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/model/TagEntity.java
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.airavata.sharing.model;
+package org.apache.airavata.research.model;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
diff --git
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/ResearchProjectRepository.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/ResearchProjectRepository.java
index 3401233d88..519d651fea 100644
---
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/ResearchProjectRepository.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/ResearchProjectRepository.java
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.airavata.research.model.DatasetResourceEntity;
import org.apache.airavata.research.model.RepositoryResourceEntity;
import org.apache.airavata.research.model.ResearchProjectEntity;
-import org.apache.airavata.sharing.model.StateEnum;
+import org.apache.airavata.research.model.StateEnum;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/repository/ResourceRepository.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/ResourceRepository.java
similarity index 96%
rename from
airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/repository/ResourceRepository.java
rename to
airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/ResourceRepository.java
index a9ffbada17..720eaea29f 100644
---
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/repository/ResourceRepository.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/ResourceRepository.java
@@ -17,12 +17,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.airavata.sharing.repository;
+package org.apache.airavata.research.repository;
import java.util.List;
import java.util.Optional;
-import org.apache.airavata.sharing.model.ResourceEntity;
-import org.apache.airavata.sharing.model.StateEnum;
+import org.apache.airavata.research.model.ResourceEntity;
+import org.apache.airavata.research.model.StateEnum;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
diff --git
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/repository/ResourceStarRepository.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/ResourceStarRepository.java
similarity index 86%
rename from
airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/repository/ResourceStarRepository.java
rename to
airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/ResourceStarRepository.java
index 0c92d0470a..3c34358ff1 100644
---
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/repository/ResourceStarRepository.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/ResourceStarRepository.java
@@ -17,12 +17,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.airavata.sharing.repository;
+package org.apache.airavata.research.repository;
import java.util.List;
-import org.apache.airavata.sharing.model.ResourceEntity;
-import org.apache.airavata.sharing.model.ResourceStarEntity;
-import org.apache.airavata.sharing.model.StateEnum;
+import org.apache.airavata.research.model.ResourceEntity;
+import org.apache.airavata.research.model.ResourceStarEntity;
+import org.apache.airavata.research.model.StateEnum;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/repository/TagRepository.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/TagRepository.java
similarity index 93%
rename from
airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/repository/TagRepository.java
rename to
airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/TagRepository.java
index 17a5a07100..76d8b5f749 100644
---
a/airavata-api/sharing-service/src/main/java/org/apache/airavata/sharing/repository/TagRepository.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/repository/TagRepository.java
@@ -17,10 +17,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.airavata.sharing.repository;
+package org.apache.airavata.research.repository;
import java.util.List;
-import org.apache.airavata.sharing.model.TagEntity;
+import org.apache.airavata.research.model.TagEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
diff --git
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/service/ResearchProjectService.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/service/ResearchProjectService.java
index 216df82b8b..daf31a65a3 100644
---
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/service/ResearchProjectService.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/service/ResearchProjectService.java
@@ -29,11 +29,11 @@ import org.apache.airavata.config.UserContext;
import org.apache.airavata.research.model.DatasetResourceEntity;
import org.apache.airavata.research.model.RepositoryResourceEntity;
import org.apache.airavata.research.model.ResearchProjectEntity;
+import org.apache.airavata.research.model.ResourceEntity;
+import org.apache.airavata.research.model.ResourceTypeEnum;
+import org.apache.airavata.research.model.StateEnum;
import org.apache.airavata.research.repository.ResearchProjectRepository;
-import org.apache.airavata.sharing.model.ResourceEntity;
-import org.apache.airavata.sharing.model.ResourceTypeEnum;
-import org.apache.airavata.sharing.model.StateEnum;
-import org.apache.airavata.sharing.repository.ResourceRepository;
+import org.apache.airavata.research.repository.ResourceRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
diff --git
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/service/ResearchResourceService.java
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/service/ResearchResourceService.java
index b24c61af5b..a4bfcfd8f3 100644
---
a/airavata-api/research-service/src/main/java/org/apache/airavata/research/service/ResearchResourceService.java
+++
b/airavata-api/research-service/src/main/java/org/apache/airavata/research/service/ResearchResourceService.java
@@ -27,18 +27,18 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.apache.airavata.config.UserContext;
import org.apache.airavata.model.user.proto.UserProfile;
+import org.apache.airavata.research.model.PrivacyEnum;
import org.apache.airavata.research.model.RepositoryResourceEntity;
+import org.apache.airavata.research.model.ResourceEntity;
+import org.apache.airavata.research.model.ResourceStarEntity;
+import org.apache.airavata.research.model.ResourceTypeEnum;
+import org.apache.airavata.research.model.StateEnum;
+import org.apache.airavata.research.model.StatusEnum;
+import org.apache.airavata.research.model.TagEntity;
import org.apache.airavata.research.repository.ResearchProjectRepository;
-import org.apache.airavata.sharing.model.PrivacyEnum;
-import org.apache.airavata.sharing.model.ResourceEntity;
-import org.apache.airavata.sharing.model.ResourceStarEntity;
-import org.apache.airavata.sharing.model.ResourceTypeEnum;
-import org.apache.airavata.sharing.model.StateEnum;
-import org.apache.airavata.sharing.model.StatusEnum;
-import org.apache.airavata.sharing.model.TagEntity;
-import org.apache.airavata.sharing.repository.ResourceRepository;
-import org.apache.airavata.sharing.repository.ResourceStarRepository;
-import org.apache.airavata.sharing.repository.TagRepository;
+import org.apache.airavata.research.repository.ResourceRepository;
+import org.apache.airavata.research.repository.ResourceStarRepository;
+import org.apache.airavata.research.repository.TagRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Page;
@@ -127,9 +127,9 @@ public class ResearchResourceService {
resource.setName(name);
resource.setDescription(description);
resource.setAuthors(authors.stream().map(String::toLowerCase).collect(Collectors.toSet()));
- Set<org.apache.airavata.sharing.model.TagEntity> tagsSet = new
HashSet<>();
+ Set<org.apache.airavata.research.model.TagEntity> tagsSet = new
HashSet<>();
for (String tag : tags) {
- org.apache.airavata.sharing.model.TagEntity t = new
org.apache.airavata.sharing.model.TagEntity();
+ org.apache.airavata.research.model.TagEntity t = new
org.apache.airavata.research.model.TagEntity();
t.setValue(tag);
tagsSet.add(t);
}
diff --git a/airavata-api/src/test/resources/META-INF/persistence.xml
b/airavata-api/src/test/resources/META-INF/persistence.xml
index f3137a0184..9b72f00cfb 100644
--- a/airavata-api/src/test/resources/META-INF/persistence.xml
+++ b/airavata-api/src/test/resources/META-INF/persistence.xml
@@ -95,7 +95,10 @@
<class>org.apache.airavata.research.model.RepositoryResourceEntity</class>
<class>org.apache.airavata.research.model.ResearchIoParamEntity</class>
<class>org.apache.airavata.research.model.ResearchProjectEntity</class>
+ <class>org.apache.airavata.research.model.ResourceEntity</class>
+ <class>org.apache.airavata.research.model.ResourceStarEntity</class>
<class>org.apache.airavata.research.model.SessionEntity</class>
+ <class>org.apache.airavata.research.model.TagEntity</class>
<!-- sharing-service -->
<class>org.apache.airavata.sharing.model.DomainEntity</class>
@@ -104,10 +107,7 @@
<class>org.apache.airavata.sharing.model.GroupAdminEntity</class>
<class>org.apache.airavata.sharing.model.GroupMembershipEntity</class>
<class>org.apache.airavata.sharing.model.PermissionTypeEntity</class>
- <class>org.apache.airavata.sharing.model.ResourceEntity</class>
- <class>org.apache.airavata.sharing.model.ResourceStarEntity</class>
<class>org.apache.airavata.sharing.model.SharingEntity</class>
- <class>org.apache.airavata.sharing.model.TagEntity</class>
<class>org.apache.airavata.sharing.model.UserEntity</class>
<class>org.apache.airavata.sharing.model.UserGroupEntity</class>
