[OLINGO-1189] Sorting entities from metamodel before building OData E…

…ntity Model
apache · Sep 3, 2023 · 6257c23 · 6257c23
1 parent 29f2fb9
commit 6257c23
Showing 1 changed file with 28 additions and 1 deletion.
diff --git a/...ore/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityType.java b/...ore/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmEntityType.java
@@ -18,6 +18,7 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.jpa.processor.core.model;
 
+import java.util.Collection;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -91,7 +92,7 @@ private class JPAEdmEntityTypeBuilder implements JPAEdmBuilder {
     @Override
     public void build() throws ODataJPAModelException, ODataJPARuntimeException {
 
-      Set<javax.persistence.metamodel.EntityType<?>> jpaEntityTypes = metaModel.getEntities();
+      Collection<javax.persistence.metamodel.EntityType<?>> jpaEntityTypes = metaModel.getEntities();
 
       if (jpaEntityTypes == null || jpaEntityTypes.isEmpty() == true) {
         return;
@@ -100,6 +101,7 @@ public void build() throws ODataJPAModelException, ODataJPARuntimeException {
 
       }
 
+      jpaEntityTypes = sortJPAEntityTypes(jpaEntityTypes);
       for (javax.persistence.metamodel.EntityType<?> jpaEntityType : jpaEntityTypes) {
         currentEdmEntityType = new EntityType();
         currentJPAEntityType = jpaEntityType;
@@ -142,6 +144,31 @@ public void build() throws ODataJPAModelException, ODataJPARuntimeException {
 
     }
 
+    private List<javax.persistence.metamodel.EntityType<?>> sortJPAEntityTypes(
+      final Collection<javax.persistence.metamodel.EntityType<?>> entities) {
+
+      List<javax.persistence.metamodel.EntityType<?>> entityTypeList =
+        new ArrayList<javax.persistence.metamodel.EntityType<?>>(entities.size());
+
+        Iterator<javax.persistence.metamodel.EntityType<?>> itr;
+        javax.persistence.metamodel.EntityType<?> smallestJpaEntity;
+        javax.persistence.metamodel.EntityType<?> currentJpaEntity;
+        while (!entities.isEmpty()) {
+          itr = entities.iterator();
+          smallestJpaEntity = itr.next();
+          while (itr.hasNext()) {
+            currentJpaEntity = itr.next();
+            if (smallestJpaEntity.getName().compareTo(currentJpaEntity.getName()) > 0) {
+              smallestJpaEntity = currentJpaEntity;
+            }
+          }
+          entityTypeList.add(smallestJpaEntity);
+          entities.remove(smallestJpaEntity);
+        }
+
+      return entityTypeList;
+    }
+
     private boolean isExcluded(final JPAEdmEntityType jpaEdmEntityType) {
       JPAEdmMappingModelAccess mappingModelAccess = jpaEdmEntityType.getJPAEdmMappingModelAccess();
       if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()